]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of git://git.ikiwiki.info
authorJavier Rojas <jerojasro@devnull.li>
Mon, 13 Sep 2010 00:25:51 +0000 (19:25 -0500)
committerJavier Rojas <jerojasro@devnull.li>
Mon, 13 Sep 2010 00:25:51 +0000 (19:25 -0500)

Trivial merge