From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 31 Jan 2014 05:46:45 +0000 (-0500)
Subject: Merge commit '827e092b58771e5c5efdbc1cf04a62a1d039a015' into sipb
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/7a3d81619c3fb50b7b77932df91edc239d3ee09c

Merge commit '827e092b58771e5c5efdbc1cf04a62a1d039a015' into sipb

Conflicts:
	templates/page.tmpl
---

7a3d81619c3fb50b7b77932df91edc239d3ee09c