From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 31 Jan 2014 05:42:15 +0000 (-0500)
Subject: Merge commit 'f8880cb670b0d1169559d04602fc543b1a6a061e' into sipb
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/10b857bb9b8cdece8d258d00492a6849ab7c06cb

Merge commit 'f8880cb670b0d1169559d04602fc543b1a6a061e' into sipb

Conflicts:
	templates/page.tmpl
---

10b857bb9b8cdece8d258d00492a6849ab7c06cb