Merge branch 'master' of git://git.ikiwiki.info
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Tue, 31 Jan 2012 07:41:28 +0000 (02:41 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Tue, 31 Jan 2012 07:41:28 +0000 (02:41 -0500)

Trivial merge