]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 19 Apr 2011 21:47:40 +0000 (17:47 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 19 Apr 2011 21:47:40 +0000 (17:47 -0400)
commitff03d125be4df039489baea31b86ef273486d0d7
treeb444a443ec025088ef9ad5bcc941aadf095052cd
parent331430fe9f092cd00db316a1b35c5fe8b42d036d
parente284f484da1848ae99db04873fd347396b093dde
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info