Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 30 Aug 2010 19:53:49 +0000 (15:53 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 30 Aug 2010 19:53:49 +0000 (15:53 -0400)
commit07f30a288d752b3ffd7cbabf1fbc10309364b4e2
treea39b501380eb004c5af514d37b9f47b8c0bd0d66
parent47cfd14e8436e201facfa906a615fd272dfc156b
parentd085d1ac5db888e95de5a43f818a13570bc4771b
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info