Merge branch 'revert'
authorJoey Hess <joey@kitenet.net>
Fri, 8 Oct 2010 23:31:06 +0000 (19:31 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 8 Oct 2010 23:31:06 +0000 (19:31 -0400)
commitf826251a6d506d6f8a31e30abfbe89338351bd6a
tree0c15b7609f6e4c1efd7b9929ff877ca4e5c400e9
parentc8214300ed6198d3a59cc1e3b3d74b0722c26b91
parent2d99fe0d34be35d9e5d556d530f2d8993007cdf6
Merge branch 'revert'