Merge commit '156f70912213b6520e9056050a8827de66e80176' into sipb

author Anders Kaseorg <andersk@mit.edu>

Fri, 31 Jan 2014 05:54:44 +0000 (00:54 -0500)

committer Anders Kaseorg <andersk@mit.edu>

Fri, 31 Jan 2014 05:54:44 +0000 (00:54 -0500)
author Anders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:54:44 +0000 (00:54 -0500)
committer Anders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:54:44 +0000 (00:54 -0500)
diff --cc IkiWiki/Plugin/git.pm
Simple merge
diff --cc IkiWiki/Wrapper.pm
Simple merge
diff --cc templates/editpage.tmpl
Simple merge
diff --cc templates/page.tmpl
Simple merge
author	Anders Kaseorg <andersk@mit.edu>
	Fri, 31 Jan 2014 05:54:44 +0000 (00:54 -0500)
committer	Anders Kaseorg <andersk@mit.edu>
	Fri, 31 Jan 2014 05:54:44 +0000 (00:54 -0500)
		1	2
IkiWiki/Plugin/git.pm	patch \|	diff1 \|	diff2 \|	blob \| history
IkiWiki/Wrapper.pm	patch \|	diff1 \|	diff2 \|	blob \| history
templates/editpage.tmpl	patch \|	diff1 \|	diff2 \|	blob \| history
templates/page.tmpl	patch \|	diff1 \|	diff2 \|	blob \| history