Merge branch 'patch-2' of github.com:nemobis/wikiq
authorBenjamin Mako Hill <mako@atdot.cc>
Fri, 18 Jul 2014 21:39:06 +0000 (14:39 -0700)
committerBenjamin Mako Hill <mako@atdot.cc>
Fri, 18 Jul 2014 21:39:06 +0000 (14:39 -0700)
commitca8e5345cbac2ce3a1f72a70bd63dfbbcef41827
treecd201060aa2f13943d73b0bd0cfa51c498c4ada5
parente5ef5d83494fb4a41e443b8c2586f0fd4cdd8e5b
parentd470ebe8c38c0df66a84db23ef32681278bda2fe
Merge branch 'patch-2' of github.com:nemobis/wikiq

Benjamin Mako Hill || Want to submit a patch?