Merge commit '1a8cbf526cdc7e77bfa084e266b8633858b68a09' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:55:36 +0000 (00:55 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:55:36 +0000 (00:55 -0500)
commitedee0db894c7e99911d9ac1b7d9453e477fe0cd6
tree7c0124db338830c9e49a796f4774963a050140c0
parent9a295bec5f361bed184c035651d6168286238b98
parent1a8cbf526cdc7e77bfa084e266b8633858b68a09
Merge commit '1a8cbf526cdc7e77bfa084e266b8633858b68a09' into sipb

Conflicts:
templates/page.tmpl
IkiWiki/CGI.pm
IkiWiki/Plugin/git.pm
IkiWiki/Plugin/httpauth.pm
IkiWiki/Plugin/mdwn.pm