mozilla/socorro — pull request #777 by Lonnen (2012-08-07 20:40:03+00:00)
Title: Mobeta merge

surprisingly there were no merge conflicts.

```
git fetch mozilla
git checkout master
git pull mozilla master
git checkout -b mobeta-merge
git pull mozilla mobeta
git push github mobeta-merge
```