Bug 920170 - Break out some pieces of prompts into their own methods. r=margaret
Bug 923391 - Prompts should return values even if they're cancelled. r=mfinkle
Merge mozilla-central to fx-team
Bug 914294 - Don't throw exceptions from the history result end batch macro to retain backwards compatibility.
r=mano
Make property descriptor tooltips easier to read on Linux (bug 926397). r=paul,msucan
Bug 904245 - Take touch radius into account when calculating pan threshold. r=kats
Bug 904245 - TWhitespace fixup r=kats
Bug 920170 - Allow adding a grid of icons to prompts. r=margaret
Merge fxteam to m-c