]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'master' into cvs
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Sat, 25 Feb 2012 22:15:13 +0000 (17:15 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Sat, 25 Feb 2012 22:15:13 +0000 (17:15 -0500)

Trivial merge