Merge branch 'master' into autotag
authorJoey Hess <joey@kitenet.net>
Thu, 22 Apr 2010 00:32:30 +0000 (20:32 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 22 Apr 2010 00:32:30 +0000 (20:32 -0400)
commit318134174f62a598ae77e2e50f53518fbd673a19
tree3671ea387ac80df37ee3cc808d87aacb6171eaca
parent20052f888277f270ab846bf8b1eb44714c1009d6
parent0bc76be8a7201de4bfaa74b7aacc0b280c097699
Merge branch 'master' into autotag