]> 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, 25 Jan 2011 19:46:37 +0000 (15:46 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 25 Jan 2011 19:46:37 +0000 (15:46 -0400)
commitc4283919acbd138776751e83d79c96d55703f4eb
tree0ea4ff4ae3938ff7dec04f3870461724a67c1f6c
parent98f7045c060f730c7904c83c607a364a31deb289
parentf9c58c90836ecf2db2899dcfa3b6101f952aab42
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info