Merge branch 'master' of github.com:ekg/wikiq
authorBenjamin Mako Hill <mako@atdot.cc>
Fri, 18 Jul 2014 21:31:11 +0000 (14:31 -0700)
committerBenjamin Mako Hill <mako@atdot.cc>
Fri, 18 Jul 2014 21:31:11 +0000 (14:31 -0700)

Trivial merge

Benjamin Mako Hill || Want to submit a patch?