Merge branch 'master' into integration
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 20 Jul 2009 05:20:43 +0000 (07:20 +0200)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 20 Jul 2009 05:20:43 +0000 (07:20 +0200)
commitbe30203459f6994f650ed56b9f7da88b8c98c137
tree1f97d8f50e6f5a05c3b7edb184c06f56145acba1
parente6709f6677f037097744a07cc9c3b58db4fd4595
parenta7b813182df7d18a0d1bf2fb28b3ee4c069c86e9
Merge branch 'master' into integration