Commit [6b55c3]  Maximize  Restore  History

Merge branch 'mozilla-central'

Conflicts:
dom/plugins/base/nsNPAPIPluginInstance.cpp

Jacek Caban Jacek Caban 2013-07-29