fix missing gboolean/gpointer when building with FB_GUI_DISABLED
Merge pull request #129 from trezor/master

fix missing gboolean/gpointer when building with FB_GUI_DISABLED
async surface drawing for windows
http://www.firebreath.org/display/documentation/Windows+Asynchronous+Surface+Rendering
Merge pull request #130 from dougma/FB-179-squashed

async surface drawing for windows
fix crash regression
fixed clang++ and g++ c++11 "narrowing convertion" compilation errors
Merge pull request #131 from ukreator/upstream_master

fixed clang++ and g++ c++11 "narrowing convertion" compilation errors
Fix detachEvent for IE11 on Windows 8+.

This was fixed for attachEvent in 76dacf7.
Merge pull request #132 from byronclark/feature/detach-event-ie11-windows-8

Fix detachEvent for IE11 on Windows 8+.
Update ConverterUtils.h

Missing space in error message.
Update FBControl.rgs

Fix for 0x80020005 error code when trying to register plugin on Windows 7

https://groups.google.com/forum/#!topic/firebreath-dev/jzORdZM6nZ4
Merge pull request #134 from kbsanders/patch-2

Update FBControl.rgs
Merge pull request #133 from kbsanders/patch-1

Update ConverterUtils.h
Fixes building ScriptingCore while using Visual Studio 2010 express
Merge pull request #135 from thoys/vc++2010-express-scriptingcore-fix

Fixes building ScriptingCore while using Visual Studio 2010 express
FIREBREATH-261 : Race condition when initializing multiple tabs in IE
Merge pull request #136 from chrishardy99/master

FIREBREATH-261 : Race condition when initializing multiple tabs in IE
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/PluginAuto/Mac/PluginEventMacCarbon.cpp
	src/PluginAuto/Mac/PluginEventMacCocoa.mm
	src/PluginAuto/Mac/PluginWindowMac.mm
	src/PluginAuto/Mac/PluginWindowMacCG.cpp