Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 25 Nov 2009 22:19:43 +0000 (17:19 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 25 Nov 2009 22:19:43 +0000 (17:19 -0500)
commitc6db2d376b5eb199999d6be41e6af6dcec6074ba
tree6e0b6397a924f3c8784f925ec45b8769b666668e
parentf0d1c32504321ae55e1663af00c15fab88558e3c
parentae64fadcce529d771c7b7047ba8859757847170a
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info