]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 9 Feb 2011 20:19:11 +0000 (16:19 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 9 Feb 2011 20:19:11 +0000 (16:19 -0400)
commitcabd1e30053752ffca4325423a52b34d0a70f0ab
treec2b984c040b52a3bedc850badddc8385888c8725
parentf2bbfed35b64ae6755e703575ceb5212be450dab
parent1ec9f5b4af589bcaf7a226a27c7965e74411e545
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info