]> 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>
Sun, 26 Dec 2010 17:55:35 +0000 (13:55 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 26 Dec 2010 17:55:35 +0000 (13:55 -0400)
commit58e854555a5af63c811185e1196fee950ea2f58d
treef2f3d7c4de8fe14f6e408d7da303e3d283fb50a6
parent171cdb69d3e3cc4d8b3023718a585092fb98dc05
parenta6f77ac14b377bf1083d3d7d75e1789c71a93b13
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info