From: Benjamin Mako Hill Date: Fri, 18 Jul 2014 21:40:28 +0000 (-0700) Subject: Merge branch 'patch-3' of github.com:nemobis/wikiq X-Git-Url: https://projects.mako.cc/source/wikiq/commitdiff_plain/21341e70f9d509aeaaf0cb6a39caf56d704dc838 Merge branch 'patch-3' of github.com:nemobis/wikiq --- 21341e70f9d509aeaaf0cb6a39caf56d704dc838