Added function header for freerdp_update_gateway_usage_method
Merge branch 'master' of git://github.com/awakecoding/FreeRDP
Merge branch 'master' of git://github.com/awakecoding/FreeRDP

# By Hardening (4) and others
# Via Marc-André Moreau
* 'master' of git://github.com/awakecoding/FreeRDP:
  libfreerdp-core: add locks to disable full duplex BIOs (currently unsafe)
  transport: add another null pointer check.
  transport: add a null pointer check.
  rdpsnd/server: fix incorrect use of channe handle.
  tcp: add timeout to prevent buggy client from hanging.
  Check that bpp has reasonable value
  Check for bpp > 0
  Set checks to be strict and also check xorBpp field
  Fixes for CVE-2014-0250
Merge branch 'master' of git://github.com/awakecoding/FreeRDP
Merge branch 'master' of git://github.com/awakecoding/FreeRDP
Merge branch 'master' of git://github.com/awakecoding/FreeRDP
Merge branch 'master' of git://github.com/awakecoding/FreeRDP
Merge branch 'master' of https://github.com/mrthebunny/FreeRDP

# Via Benoit LeBlanc
* 'master' of https://github.com/mrthebunny/FreeRDP:
fix smart sizing parsing
Merge branch 'master' of git://github.com/awakecoding/FreeRDP