Merge remote branch 'origin/master'
authorJoey Hess <joey@kitenet.net>
Sat, 8 May 2010 23:44:40 +0000 (19:44 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 8 May 2010 23:44:40 +0000 (19:44 -0400)
commit8e50e00d25d321a8689051f7ab7452311c3925d5
tree463de48368a81d7c82ca96f89b05cd46e2627b84
parenta380fa0e6b3e18db86eb00ab235abfc75581a11d
parent6512423f159a0917137b2caca3fa244147dd0131
Merge remote branch 'origin/master'