]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 3 Jun 2011 16:17:49 +0000 (12:17 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 3 Jun 2011 16:17:49 +0000 (12:17 -0400)
commit136846d442ea25a79203cdefe1eafbbce37197b1
treef31e47c6589abf7c38bdfb626636255e73090e72
parentd336d18607bbbe42f887796d57c4e426fd82318f
parentade49d1e888d68f802e9c0b17badb754c0744ddb
Merge branch 'master' of ssh://git.ikiwiki.info