From: Benjamin Mako Hill <mako@atdot.cc>
Date: Mon, 9 Apr 2012 22:13:42 +0000 (-0400)
Subject: merge patched into master
X-Git-Url: https://projects.mako.cc/source/python-simplemediawiki.debian/commitdiff_plain/6fb8e7c11cf7aab6efc4b4f961ad460528b8dc16?hp=6fb8e7c11cf7aab6efc4b4f961ad460528b8dc16

merge patched into master
---