Merge branch 'master' into next
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 29 Dec 2008 20:08:32 +0000 (15:08 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 29 Dec 2008 20:08:32 +0000 (15:08 -0500)
commit1ca191b5707ef38af5cbe196e314d57cd5c8c065
tree87edfb96870dcbfca639fb726f1beefbbd06b6d8
parentf34dc3d8bdfce58a628c8af75f3f3e09b604b1aa
parent82e6902a67ac5ad06a9174c240b7f521daa6c21e
Merge branch 'master' into next