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

Merge commit 'ffcd2da8274b44663207bb866007ee3bc8d8a15f' into sipb

Conflicts:
	templates/page.tmpl
---

c0c0068a0308884dc41921157d672c62eef9e83d