Merge branch 'epoch-work'
commit51175f31c4aac9df6ceeffc7855a0f842c580fdb
authorDan McGee <dan@archlinux.org>
Sat, 22 Jan 2011 16:03:51 +0000 (22 10:03 -0600)
committerDan McGee <dan@archlinux.org>
Sat, 22 Jan 2011 16:03:51 +0000 (22 10:03 -0600)
tree4fe5405a24aa967572f407dafbbee9231a25b0dc
parente277e838d798c1463ae5df98dcf637df70e048ec
parent859bdb5b1d1b9ccb781c95026836283a005a96ce
Merge branch 'epoch-work'
doc/Makefile.am
scripts/repo-add.sh.in