From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 31 Jan 2014 05:31:51 +0000 (-0500)
Subject: Merge commit '0aad1794ad27da6ab41001e335eba952c2e0ac88' into sipb
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/7e73e880e23c6832b378c8139d65d309544b83e8?hp=3ad2ae0d5c5b25dc20e834508ec355909007118c

Merge commit '0aad1794ad27da6ab41001e335eba952c2e0ac88' into sipb

Conflicts:
	templates/page.tmpl
---