Bug 841337 - GCLI web should have continuous integration. Maybe Travis-CI; r=mratcliffe
Bug 767588 - GCLI number type should allow restriction to integers; r=jwalker
Bug 768039 - Refactor 'cmd refresh' to use OS.File; r=jwalker
Bug 812762 - Use &brandShortName; instead of Firefox; r=jwalker
Bug 817947 - Swap tab states (not docShells) when swapBrowsersAndCloseOther() is called with a pending tab; r=gavin
Bug 842511 - Specify a character set for directory listings; r=Waldo
Bug 842512 - Specify a character set for error pages; r=Waldo
Bug 842511 - Fix xpcshell bustage; r=me
Backed out changeset 96d8ca0dd540 (bug 842511)
Backed out changeset 7052d37a8b25 (bug 842512)
Backed out changeset 4d74fe8e6560 (bug 842511)
merge m-c to fx-team