Merge branch 'channels' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 9 Oct 2012 18:00:51 +0000 (14:00 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 9 Oct 2012 18:00:51 +0000 (14:00 -0400)
commitf8013ff6ac3e58cd806941f17c26b71c6d1d8ad8
treee5c26f1577a262e64bed1d23aa8cdbcbbb669597
parentce13f39de2f8106d4135b33943cec36720f97cfb
parent4b1b51b1f88ba8ff2a175f56be6434025ebcb83d
Merge branch 'channels' of github.com:FreeRDP/FreeRDP