diff options
author | Dan McGee <dan@archlinux.org> | 2011-01-22 17:03:51 +0100 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2011-01-22 17:03:51 +0100 |
commit | 51175f31c4aac9df6ceeffc7855a0f842c580fdb (patch) | |
tree | 4fe5405a24aa967572f407dafbbee9231a25b0dc /doc/footer.txt | |
parent | e277e838d798c1463ae5df98dcf637df70e048ec (diff) | |
parent | 859bdb5b1d1b9ccb781c95026836283a005a96ce (diff) | |
download | pacman-51175f31c4aac9df6ceeffc7855a0f842c580fdb.tar.gz pacman-51175f31c4aac9df6ceeffc7855a0f842c580fdb.tar.xz |
Merge branch 'epoch-work'
Diffstat (limited to 'doc/footer.txt')
-rw-r--r-- | doc/footer.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/footer.txt b/doc/footer.txt index 8290f3c4..2ffb0092 100644 --- a/doc/footer.txt +++ b/doc/footer.txt @@ -18,13 +18,14 @@ Authors Current maintainers: +* Allan McRae <allan@archlinux.org> * Dan McGee <dan@archlinux.org> * Xavier Chantry <shiningxc@gmail.com> -* Aaron Griffin <aaron@archlinux.org> Past contributors: * Judd Vinet <jvinet@zeroflux.org> * Aurelien Foret <aurelien@archlinux.org> +* Aaron Griffin <aaron@archlinux.org> See the 'AUTHORS' file for additional contributors. |