]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 20 Dec 2012 23:33:48 +0000 (19:33 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 20 Dec 2012 23:33:48 +0000 (19:33 -0400)
commit23791480f00d7f3faf3531b861b41a5471677451
tree1406a6ea8b70c7e9191a1edcea7b0aca30c26d79
parent4f274e04544d5cb25f693e3590d32e181a13ea9e
parent10556fa8d02f7510e3a68d049e4357bf324e1e77
Merge branch 'master' of ssh://git.ikiwiki.info