Merge branch 'master' into sipb
authorQuentin Smith <quentin@mit.edu>
Sun, 25 Jan 2015 03:49:03 +0000 (22:49 -0500)
committerQuentin Smith <quentin@mit.edu>
Sun, 25 Jan 2015 03:49:03 +0000 (22:49 -0500)
commit1dde8961f4f93f4210f5e55c5e378198473053be
treeaddcc8dd257350a275cbf01095b8fd8a1c363928
parentaea9a6892f40347098d91e4afdb7c1911e59387c
parent8c35714a37095c720308478660001a5fd9db5bfc
Merge branch 'master' into sipb

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