[Bug 867514] Fix location resolving (typo!) [r=crdlc]
Bug 867649 - Switch the SMS app from using the high-priority wake lock to the CPU wake lock.

Without this patch, I think it's possible for us not to notify the user
of an incoming SMS, failing for the same reason that we sometimes don't
ring alarms: The device goes to sleep before we play the sound.
Merge pull request #9499 from jlebar/sms-use-cpu-lock

Bug 867649 - Switch the SMS app from using the high-priority wake lock t...
Bug 864257 - update wifi relative signal strength on statusbar
Bug 842349 - disable travis except master
Merge pull request #9505 from yurenju/bug842349-reopen

Bug 842349 - disable travis except master r=vivien
Merge pull request #9503 from alivedise/bugzilla/864257

Bug 864257 - update wifi relative signal strength on statusbar, r=timdream, a=blocking-b2g:tef+
Merge pull request #9497 from EverythingMe/bugfix-location

[Bug 867514] Fix location resolving (typo!) [r=crdlc]
Merge branch 'master' of github.com:mpizza/gaia