Merge branch 'maint'
authorVic Lee <llyzs@163.com>
Wed, 18 Aug 2010 14:41:12 +0000 (22:41 +0800)
committerVic Lee <llyzs@163.com>
Wed, 18 Aug 2010 14:41:12 +0000 (22:41 +0800)
commit8ce1581e1254a821f400f1a85085079962a6e88f
tree81f86b322b275a6930adfceead04f0308b908c7e
parente4bd3ca5681cf76fa948a9c3a0301df5bbcfa813
parent0c3f9634313b271df9ecde362c806a3f3df3bca1
Merge branch 'maint'

Conflicts:
libfreerdp/rdp.c
libfreerdp/secure.c
channels/rdpdr/disk/disk_main.c
doc/xfreerdp.1