lonnen/socorro — pull request #14 by lonnen (2013-11-22 21:18:51+00:00)
Title: Updated with the latest code from Master

I pulled the latest master into your branch so that it will merge cleanly with master.