]> sipb.mit.edu Git - ikiwiki.git/commit
Merge commit 'ecdfd1b8644bc926db008054ab6192e18351afed' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:50:01 +0000 (00:50 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:50:01 +0000 (00:50 -0500)
commita58c3cfcbfcfc3f6d660642b187e61aa75472e6f
tree8cf5206691cbce512f94874871fd27b52227632b
parent3627f6f9ed4776a6f010f2e66b4ba9bda25c5932
parentecdfd1b8644bc926db008054ab6192e18351afed
Merge commit 'ecdfd1b8644bc926db008054ab6192e18351afed' into sipb

Conflicts:
IkiWiki/Plugin/git.pm
IkiWiki/CGI.pm
IkiWiki/Plugin/git.pm
templates/editpage.tmpl