Merge branch 'master' into staging
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 31 Jul 2009 08:28:26 +0000 (10:28 +0200)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 31 Jul 2009 08:28:26 +0000 (10:28 +0200)
commite78a8c2834e7ad880ab45d26db3a952df8465493
tree66530e65b143bfe8dc25aca47968850b7115b3d9
parentf1a70921e3bfc0496b5564582a5a1463b7a98c09
parentd24f8b5c372445e433a32e37d9c11ecc53156516
Merge branch 'master' into staging