From: Benjamin Mako Hill <mako@atdot.cc>
Date: Fri, 18 Jul 2014 21:39:06 +0000 (-0700)
Subject: Merge branch 'patch-2' of github.com:nemobis/wikiq
X-Git-Url: https://projects.mako.cc/source/wikiq/commitdiff_plain/ca8e5345cbac2ce3a1f72a70bd63dfbbcef41827?hp=ca8e5345cbac2ce3a1f72a70bd63dfbbcef41827

Merge branch 'patch-2' of github.com:nemobis/wikiq
---