Bug 830197 - Check visibility of the element before typing. r=mdas a=test-only
Bug 842932 - Add Preferences::RegisterCallbackAndCall which registers a callback and calls it. r=bsmedberg, a=tef+
Bug 842932 - Update to use Preferences::RegisterCallbackAndCall to correct pref callback from getting wrong params. r=smaug, a=tef+
Bug 858550 - Don't transform fixed layer descendents multiple times. r=nrc, a=tef+

Once the transform for async scrolling has been applied to a fixed layer, it
need not be applied to its descendents. Make sure to return after applying
the transform.
Bug 853716 - Let the SMS protocol handler deal with sms: url without numbers. r=baku, a=tef+
Bug 860971 - If changing the visibility changes contentviewer, don't try to proceed in nsFrameLoader::Show. r=bz, a=tef+
Bug 854302 - [Buri][WIFI]Cann't disconnect WIFI when connect AP use WPS. r=mrbkap, a=tef+
Bug 851658 - Fix test_proximity_change intermittent failure; r=jgriffin, a=test-only
Bug 836201 - [FM Radio] Music is not playing while FM is playing in background. r=jlebar, a=leo+
Bug 843445 - B2G MMS: provide nsIDOMMobileMessageManager.retrieveMMS() to retrieve MMS for the deferred retrieval mode, part-1:idl part. r=vyang, sr=sicking

Conflicts:
	dom/mobilemessage/interfaces/nsIDOMMobileMessageManager.idl
Bug 843445 - B2G MMS: Provide nsIDOMMobileMessageManager.retrieveMMS()  to retrieve MMS for the deferred retrieval mode, part-2:mms_service. r=vyang, r=gene.lian, sr=sicking
Bug 838467 1/5: use DOMCursor instead of SmsCursor. Interface changes. sr=sicking, r=bent

Conflicts:
	dom/mobilemessage/interfaces/nsIDOMSmsManager.idl
Bug 838467 2/5: DOM implementation. r=sicking,bent

Conflicts:
	dom/mobilemessage/interfaces/moz.build
	dom/mobilemessage/src/MobileMessageCallback.cpp
	dom/mobilemessage/src/SmsCursor.cpp
	dom/mobilemessage/src/SmsManager.cpp
	dom/mobilemessage/src/SmsMessage.h
	dom/mobilemessage/src/SmsRequest.cpp
	dom/mobilemessage/src/SmsRequest.h
Bug 838467 3/5: IPC. r=sicking,bent
Bug 838467 4/5: RIL. r=gwagner
Bug 838467 5/5: test cases. r=gwagner
Bug 849739 1/4 - WebSMS: Replace GetThreadList() with DOMCursor based GetThreads(). Interface changes. sr=mounir, r=bent
Bug 849739 2/4: DOM. r=mounir,mrbkap

Conflicts:
	dom/mobilemessage/interfaces/moz.build
	dom/mobilemessage/src/MobileMessageCallback.cpp
	dom/mobilemessage/src/SmsRequest.cpp
	dom/tests/mochitest/general/test_interfaces.html
Bug 849739 3/4: IPC. r=bent
Bug 849739 4/4: RIL. r=gwagner

Conflicts:
	dom/mobilemessage/src/ril/MobileMessageDatabaseService.js