Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 5 Dec 2011 19:17:53 +0000 (15:17 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 5 Dec 2011 19:17:53 +0000 (15:17 -0400)
commit2c7a8bd6848fd90de9c88c51765325ca51453713
tree87448225ba78dd4d2c3eb8e4ce3003a1fa7db53e
parentaa226bbb6ba913db0ce428641d4fde733b63f0a8
parent4b99befd36797a228b993203f0bad312a87921d2
Merge branch 'master' of ssh://git.ikiwiki.info