mozilla-b2g/gaia — pull request #16939 by gasolin (2014-03-06 10:02:05+00:00)
Title: Revert "Revert "Merge remote-tracking branch 'upstream/master' into bubb...

...le-tea""

This reverts commit a76dc9b333ef8b24e0ea20e50116abb1914ab285.