]> 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>
Wed, 9 Feb 2011 17:22:52 +0000 (13:22 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 9 Feb 2011 17:22:52 +0000 (13:22 -0400)
commit0c68cd556a7d2c7395aed2a4e101c0ced0e33726
treee0463515cc2aa8c3aaf3da37021f860b9f00da13
parent842fc8d8b45d83d013b16633df7eaaafa5a5ef28
parente67c43b0aecf382500cd3913d80d3be49d11975e
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info