upgrade to django-browserid 0.10.1 (bug 846349)
Added waffle flags to consumer-info api (bug 1021296)

Conflicts:
	mkt/fireplace/views.py
have -dev languages to be prod languages + dbg (bug 1016125)
Merge pull request #2267 from cvan/amo-langs

have -dev languages to be prod languages + dbg (bug 1016125)
add new languages: Basque (eu) and Tamil (ta) (bug 1024758)
Add comment about new regions
Commit from Mozilla Verbatim by user amanpreet.alam@gmail.com.: 494 of 2491 strings translated (0 fuzzy).
add API endpoint for FxA login (bug 1021295)
Merge pull request #2258 from washort/fxa-api

add API endpoint for FxA login (bug 1021295)
typo
Commit from Mozilla Verbatim by user amanpreet.alam@gmail.com.: 854 of 2491 strings translated (173 fuzzy).
fix feed test
Commit from Mozilla Verbatim by user markh@babelzilla.org.: 2491 of 2491 strings translated (0 fuzzy).
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Taught lookup tool about disabled_by_user (bug 992342)
settings: HAS_SYSLOG = True
Merge pull request #2270 from oremj/has-syslog-true

settings: HAS_SYSLOG = True
A refactor too far
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Use FxA API endpoint for developer pages too (bug 1021295)