]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge remote-tracking branch 'schmonz/cvs'
authorJoey Hess <joey@kitenet.net>
Mon, 30 Jan 2012 18:35:03 +0000 (14:35 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 30 Jan 2012 18:35:03 +0000 (14:35 -0400)
commitb33f69ab514f83d3fed1fd873f251d62f65d62a1
treea04b68cc72c602e4ddb76475685bbaec94a99eb8
parent522b24a0f1a468c60018ddcae1c9e79f1c96d246
parentd6b7654fcf87186210f02e81468d77643dd0e2e0
Merge remote-tracking branch 'schmonz/cvs'