From: Erik Garrison <erik.garrison@gmail.com>
Date: Mon, 2 May 2011 18:06:05 +0000 (-0700)
Subject: Merge pull request #1 from makoshark/master.
X-Git-Url: https://projects.mako.cc/source/wikiq/commitdiff_plain/87e6add2820dd71cd79585d3ffa74f7fe46820f3?hp=-c

Merge pull request #1 from makoshark/master.

Two Quick Fixes from Mako
---

87e6add2820dd71cd79585d3ffa74f7fe46820f3