Merge branch 'patch-3' of github.com:nemobis/wikiq master
authorBenjamin Mako Hill <mako@atdot.cc>
Fri, 18 Jul 2014 21:40:28 +0000 (14:40 -0700)
committerBenjamin Mako Hill <mako@atdot.cc>
Fri, 18 Jul 2014 21:40:28 +0000 (14:40 -0700)
1  2 
wikiq.cpp

diff --cc wikiq.cpp
Simple merge

Benjamin Mako Hill || Want to submit a patch?