mozilla/fxa-content-server — pull request #951 by ckarlof (2014-04-18 21:32:33+00:00)
Title: Train 10

Merge 0.10.1 hot patch back into master.