]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 27 Nov 2011 17:20:53 +0000 (13:20 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 27 Nov 2011 17:20:53 +0000 (13:20 -0400)
commit9412876ffdc8bb868b310d9e07bd90867e3ca36b
tree146f7e4080d946efade090b7503638310f836a47
parentdaaedf27ef7fe18c7c12b13a7db0ed0dae91bd1e
parentc360815f200bd67812d288d23cc8a51e547e3660
Merge branch 'master' of ssh://git.ikiwiki.info