mozilla/kitsune — pull request #2197 by mythmon (2014-10-29 20:02:10+00:00)
Title: Fix bad merge.

I screwed up during the "merge" portion of the rebase of the profile API. This fixes. Lets make sure Travis likes this.

r?