Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 25 Nov 2009 06:18:56 +0000 (01:18 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 25 Nov 2009 06:18:56 +0000 (01:18 -0500)
commit4035c7f396edac2b4e4b6e344b12fb014542fd08
treec96272637f87d868183b950ec276c5ec60af74d5
parentdf75c5b93a1067461b649e48cc62d4c7f4d18ec7
parent4adf2e27c671d6b5441762df34c5ad32d91defe3
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info