Robuta

https://bugzilla.mozilla.org/show_bug.cgi?id=574836 574836 - [preview.amo] git is in the middle of a conflicted merge VERIFIED (chizu) in mozilla.org Graveyard - Server Operations. Last updated 2015-03-12. in the middle