]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of git://git.ikiwiki.info
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Mon, 23 Jan 2012 01:49:34 +0000 (20:49 -0500)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Mon, 23 Jan 2012 01:49:34 +0000 (20:49 -0500)

Trivial merge