Bug 949639 - Move CanAddURI to nsAndroidHistory r=blassey
Bug 949380 - [Australis] Add @hidden=true initially to UITour panels. r=Unfocused
Bug 948478 - Metro Firefox hangs at startup trying to show add-on update dialog. r=mbrubeck
Bug 949590 - When switching browsers, wait for the previous instance to close the profile before launching. r=bbondy
Bug 949590 - Follow up, turn off CEH debug console. r=me
Bug 949590 - fix windows build bustage. r=bustage
Bug 772261 - Add duration to token server and client. r=rnewman
Bug 945829 - Metrofox hangs on startup when trying to show the profile chooser dialog. r=jimm
Bug 948946 - Test toolkit, not platform, for linux theme. r=dao
Bug 949241 - Enhance HAWK tests. r=rnewman
Bug 950075 - Don't forward non-navigation keys to the menu list [r=rsilveira]
Merge fx-team to m-c.
Backed out changeset b6dab3694be2 (bug 949380)
Merge mozilla-central into holly.