Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 20 Apr 2010 02:19:09 +0000 (22:19 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 20 Apr 2010 02:19:09 +0000 (22:19 -0400)
commit1734e99d27347ffa736a76846128f90fa0bc9863
treea5a6cb097cffd1fd9a5316c45765ed4cd0b8e095
parent2111bf0408620a307c8c0373489ef34ca6626fd2
parent65510a3c05fec6008587b0379911314c6cfacd19
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info