Bug 815110 - Change DOMWifiManager so it returns null instead of creating the object if the caller doesn't have the correct permission. r=mrbkap
Bug 845707 - Only filter file path that is a '~' or starts with '~/'. r=dougt
Bug 863035 - WebSMS: use 'null' to reset SmsFilter::read and threadId. r=mounir,Ms2ger
Bug 863620 - Followup of bug 848414, r=echou
Bug 863092 - Make mach run and mach debug run firefox -no-remote; r=gps

DONTBUILD
Merge birch to m-c.
Merge m-c to inbound.
Backed out changeset 4a55715677d7 (bug 856807) for intermittent Linux32 reftest-ipc timeouts.