]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 30 Jan 2012 19:15:28 +0000 (15:15 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 30 Jan 2012 19:15:28 +0000 (15:15 -0400)
commitc22f316ae153af4dba1a8a09ee743807d636bace
treee2369de10ab8cc160a156332eb59d93b8b363b1b
parent2ebae85f9b311470a8e3440d041de766980fdfa5
parentf77784affdc9f05be06eb0be3c26bb81ef41ec8f
Merge branch 'master' of ssh://git.ikiwiki.info