Merge pull request #22 from TheBlueMatt/master

Maybe I shouldnt be allowed to touch the website anymore...
This commit is contained in:
Gavin Andresen 2012-03-16 17:51:59 -07:00
commit 0f9d755e16