]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' into cvs
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Sat, 21 Jan 2012 03:33:27 +0000 (22:33 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Sat, 21 Jan 2012 03:33:27 +0000 (22:33 -0500)
commit12fd902fb1228feb4e23a1f850f215122a4c7e3f
treedacfba21d947b2c5c4101068d6a9bd65e027add6
parentde04fd539805cc38e747ea684ada03d65903e34f
parent74880397d03c694365b0376243a18e39c020f4af
Merge branch 'master' into cvs