Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 10 Dec 2013 16:54:03 +0000 (11:54 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 10 Dec 2013 16:54:03 +0000 (11:54 -0500)
commit62199fc46a03ad3aca0054a786fd73f2ee205096
tree9fa329067d9f0046b262932390a9a1cca7405bda
parentebaa96aa73c8915c452bb77c39282aab252c540e
parent0ed993635f8e66f5595e4ca9712135d13fa4150c
Merge branch 'master' of github.com:FreeRDP/FreeRDP
libfreerdp/crypto/tls.c
winpr/libwinpr/environment/environment.c
winpr/libwinpr/sysinfo/sysinfo.c