Merge remote-tracking branch 'upstream/master' into httpproxy
authorChristian Plattner <ccpp@gmx.at>
Thu, 22 Jan 2015 13:32:15 +0000 (14:32 +0100)
committerChristian Plattner <ccpp@gmx.at>
Thu, 22 Jan 2015 13:33:17 +0000 (14:33 +0100)
commit33320a2e0234f0b00575f197afe27e1073f6e65c
tree2bb08c3567cfb83e7127258862697979da1fd2d5
parent91eddce7fba1d801bb969739844b87fcb2310755
parent1c227350bd7cb2d77aab4ce753cd7200ddf5b9a6
Merge remote-tracking branch 'upstream/master' into httpproxy

Conflicts:
libfreerdp/core/settings.c
libfreerdp/core/tcp.c
libfreerdp/core/transport.c
client/common/cmdline.c
include/freerdp/settings.h
libfreerdp/common/settings.c
libfreerdp/core/CMakeLists.txt
libfreerdp/core/proxy.c
libfreerdp/core/settings.c
libfreerdp/core/tcp.c
libfreerdp/core/transport.c