]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 4 Oct 2013 16:36:21 +0000 (12:36 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 4 Oct 2013 16:36:21 +0000 (12:36 -0400)
commit2e3d535c6b71a1a4784525730803bb1c3c5403e8
treea1cf238b19c3daa68cc23983a97010dc8d5d71a2
parent1b64f369e3edc1b4e185c33380a8bbf88a41715a
parentffa5e046b68b49a5866b3768e3a9bf245fd5aa3d
Merge branch 'master' of ssh://git.ikiwiki.info