From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 31 Jan 2014 05:49:06 +0000 (-0500)
Subject: Merge commit '1609da8f00e29c580e92fd1d3c2b093cbc41d20e' into sipb
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/3627f6f9ed4776a6f010f2e66b4ba9bda25c5932

Merge commit '1609da8f00e29c580e92fd1d3c2b093cbc41d20e' into sipb

Conflicts:
	templates/page.tmpl
---

3627f6f9ed4776a6f010f2e66b4ba9bda25c5932