fix typo
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
Settings: persist SmartSizing
settings: GatewayBypassLocal TRUE by default
Merge branch 'master' of https://github.com/mrthebunny/FreeRDP

# By Marc-André Moreau
# Via Benoit LeBlanc (1) and Marc-André Moreau (1)
* 'master' of https://github.com/mrthebunny/FreeRDP:
  libfreerdp-core: fix potential crash on session redirection failure
Merge branch 'master' of github.com:mrthebunny/FreeRDP
channels/rdpdr: replace usage of strndup
freerdp: add more vendor options
freerdp: fix type build warnings
Merge branch 'master' of github.com:awakecoding/FreeRDP
winpr: fix ranlib missing symbols warnings on OS X
libwinpr-smartcard: fix cmake script
freerdp: fix build warnings on Windows
Merge branch 'master' of github.com:FreeRDP/FreeRDP
freerdp: fix improper .rdp file parsing
libwinpr-locale: fix inclusion of stdarg.h
libfreerdp-common: fix AsyncUpdate get/set
Merge branch 'master' of github.com:awakecoding/FreeRDP