Merge commit '546da9bac7135d7d1b02dce0c0eef2209d939fc6' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:56:22 +0000 (00:56 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:56:22 +0000 (00:56 -0500)
commit7e0d4b422d97a7c8cdb196e86df9869d2cbf88be
tree4505cf65ff21c8c4bd2f1e83337b1a8a95c96a75
parentedee0db894c7e99911d9ac1b7d9453e477fe0cd6
parent546da9bac7135d7d1b02dce0c0eef2209d939fc6
Merge commit '546da9bac7135d7d1b02dce0c0eef2209d939fc6' into sipb

Conflicts:
templates/page.tmpl
IkiWiki/Plugin/git.pm
IkiWiki/Wrapper.pm
po/Makefile
templates/editpage.tmpl