From: Benjamin Mako Hill <mako@atdot.cc>
Date: Fri, 18 Jul 2014 21:34:27 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh-nemobis/patch-1'
X-Git-Url: https://projects.mako.cc/source/wikiq/commitdiff_plain/b709f85fedff91f10850903a0ef609792ca65f51?hp=b46991ccfb280f0d64fe3d15fb1862f49f08beaf

Merge remote-tracking branch 'gh-nemobis/patch-1'
---