]> 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>
Thu, 2 Dec 2010 00:25:52 +0000 (20:25 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 2 Dec 2010 00:25:52 +0000 (20:25 -0400)
commit971322bdb68b5afabde47650174fdd4673fed0a2
treed271c56f9f96a4d2664152ec1b9f6ec5d931f5e2
parentaa65300c2f6a22d4372020b4b5b1a04b5842531a
parentad5e9c0085a02bfcf9c33095881ec4f173aaed00
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info