update
Merge branch 'master' of https://github.com/mozilla-b2g/gaia
Merge branch 'master' of https://github.com/mozilla-b2g/gaia
Merge branch 'master' of https://github.com/mozilla-b2g/gaia
Merge branch 'master' of https://github.com/mozilla-b2g/gaia
v1
Merge branch 'master' of https://github.com/rnowm/gaia
Merge branch 'bug-834628' of https://github.com/crdlc/gaia into cristian