elkarte/Elkarte — pull request #375 by norv (2013-05-08 18:57:43+00:00)
Title: Elk/pr/370

Picked previous Josh's PR for review.