]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' into cvs
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Thu, 2 Feb 2012 03:07:03 +0000 (22:07 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Thu, 2 Feb 2012 03:07:03 +0000 (22:07 -0500)
commitf29c12422e92a58069e0f157d6e9c3ce6e859fee
treec9d8b992d8a6dd6e520f0f992aecb0623bcdfb71
parentfc316b9da190c3dd8b7dd28541f70d4dbf3bce91
parentbd5e75fd6dc7adef3dde52284282655a06a951fe
Merge branch 'master' into cvs