]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of file:///srv/git/ikiwiki.info
authorJoey Hess <joey@finch.kitenet.net>
Tue, 11 May 2010 21:52:39 +0000 (21:52 +0000)
committerJoey Hess <joey@finch.kitenet.net>
Tue, 11 May 2010 21:52:39 +0000 (21:52 +0000)
commit688c58ac9080362e9f033bc6cc50d4b2d7d46d6f
treede6c9b384cf71599df3f35874aea6ec19188d377
parent4ceae1761b6f190a6115c106713d28f0a94e9191
parent378cae14bbd540aa1cd6b165bee408c0add169c3
Merge branch 'master' of file:///srv/git/ikiwiki.info