Merge branch 'channels' of github.com:FreeRDP/FreeRDP into channels
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 17 Oct 2012 00:01:54 +0000 (20:01 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 17 Oct 2012 00:01:54 +0000 (20:01 -0400)
commit645b1a36c94be60997dacdf394a04958261d843d
tree154d5522e3e54b73a5b0b1b4ebed8c085aefd6c4
parente87df0b7cc674408245c96037cb7ce3a7229e0a9
parent0c1fd59d5f32065a8a795fc95c7ef6311439aa7a
Merge branch 'channels' of github.com:FreeRDP/FreeRDP into channels