Merge branch 'master' of git://git.ikiwiki.info into cvs
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Wed, 25 Jan 2012 05:41:53 +0000 (00:41 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Wed, 25 Jan 2012 05:41:53 +0000 (00:41 -0500)

Trivial merge