]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of git://git.ikiwiki.info
authorSvend Sorensen <svend@ciffer.net>
Mon, 19 Apr 2010 23:13:10 +0000 (16:13 -0700)
committerSvend Sorensen <svend@ciffer.net>
Mon, 19 Apr 2010 23:13:10 +0000 (16:13 -0700)

Trivial merge