]> sipb.mit.edu Git - ikiwiki.git/commit
Merge commit '58a07f9e5436ec815c0cb5736a9680096c977eed' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:34:45 +0000 (00:34 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:34:45 +0000 (00:34 -0500)
commitef6f07cc0656b3deb64ba06a338cf1a508909a4f
tree40b3283f8f3e7566501459df978fbe164b3d992e
parent7e73e880e23c6832b378c8139d65d309544b83e8
parent58a07f9e5436ec815c0cb5736a9680096c977eed
Merge commit '58a07f9e5436ec815c0cb5736a9680096c977eed' into sipb

Conflicts:
templates/page.tmpl
IkiWiki/Wrapper.pm
templates/page.tmpl