]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge commit '5971a731e98b9b6543d78572c181ffc1bb7e1dd1' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:36:12 +0000 (00:36 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:36:12 +0000 (00:36 -0500)
Conflicts:
templates/page.tmpl


Trivial merge