summaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2008-06-25 18:32:11 -0400
committerMichael DeHaan <mdehaan@redhat.com>2008-06-25 18:32:11 -0400
commitee91bc059e27143d481be516a36882d334440431 (patch)
tree4bcb9adf4e0961794be85f4c0c25741d65a18c54 /AUTHORS
parente1c3a4f12091eed9ce028c23c3fda4ab9fd38f4a (diff)
parent8a6815593ba30b1bd7f68f6ee393436088c43012 (diff)
downloadcobbler-ee91bc059e27143d481be516a36882d334440431.tar.gz
cobbler-ee91bc059e27143d481be516a36882d334440431.tar.xz
cobbler-ee91bc059e27143d481be516a36882d334440431.zip
Merge branch 'master' into devel
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 640d1363..915baa8f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -21,6 +21,7 @@ Patches and other contributions from:
Adrian Likins <alikins@redhat.com>
David Lutterkort <dlutter@redhat.com>
Lester M. <needwork@gmail.com>
+ Sean Millichamp <sean@bruenor.org>
Jim Meyering <jim@meyering.net>
Perry Myers <pmyers@redhat.com>
Jack Neely <jjneely@ncsu.edu>