]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge remote-tracking branch 'smcv/trail'
authorJoey Hess <joey@kitenet.net>
Thu, 5 Apr 2012 16:22:41 +0000 (12:22 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 5 Apr 2012 16:22:41 +0000 (12:22 -0400)
commitc3d5775757e334e167beed98af01d4e3b2396dd2
tree532fd75dd902d80472f9998e2fc74714a377ffb1
parent49c67905a9dd2d106bb011013961d2f238ba3953
parent276ab9a78a0577ddd11f0e8e419149c6241af90e
Merge remote-tracking branch 'smcv/trail'