summaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
authorFabian Affolter <fabian@bernewireless.net>2010-12-13 23:26:31 +0100
committerFabian Affolter <fabian@bernewireless.net>2010-12-13 23:26:31 +0100
commit875aefd9beb9e7fd464348c0e0fa42896dc329ff (patch)
tree6c9920648f7c56a9a5854c1dafa474d8e8139508 /AUTHORS
parentf5792d907e357c90624ec110d908d42b94296a12 (diff)
parent71bb583ac04ff1c52e03d69a91bbb508783566f8 (diff)
downloadbcfg2-875aefd9beb9e7fd464348c0e0fa42896dc329ff.tar.gz
bcfg2-875aefd9beb9e7fd464348c0e0fa42896dc329ff.tar.bz2
bcfg2-875aefd9beb9e7fd464348c0e0fa42896dc329ff.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS2
1 files changed, 1 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 6c6ba4c51..d90874ad4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
-In chronological order:
+In chronological order:
- Narayan Desai <desai@mcs.anl.gov> has written most of bcfg2,
including all parts not explicitly mentioned in this file