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)
commit21341e70f9d509aeaaf0cb6a39caf56d704dc838
treeb85d169531806cf1aca658de4e7f22471c04ddc7
parentca8e5345cbac2ce3a1f72a70bd63dfbbcef41827
parent52439920a4c0a49a568ef58b9b19d968f96eb1e8
Merge branch 'patch-3' of github.com:nemobis/wikiq
wikiq.cpp

Benjamin Mako Hill || Want to submit a patch?