From: Quentin Smith <quentin@mit.edu>
Date: Sat, 13 Mar 2010 22:53:12 +0000 (-0500)
Subject: Merge branch 'master' into sipb
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/ce7966a82cf8d0043a771a1a5b26e3a953e909b2

Merge branch 'master' into sipb

Conflicts:
	po/bg.po
	po/cs.po
	po/da.po
	po/de.po
	po/es.po
	po/fr.po
	po/gu.po
	po/ikiwiki.pot
	po/pl.po
	po/sv.po
	po/vi.po
	templates/misc.tmpl
	templates/page.tmpl
---

ce7966a82cf8d0043a771a1a5b26e3a953e909b2