Merge branch 'master' of github.com:FreeRDP/FreeRDP-1.0
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 25 Jul 2011 16:25:39 +0000 (12:25 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 25 Jul 2011 16:25:39 +0000 (12:25 -0400)
commit68b6172bde8561b8159031f57c2ef0bd565e90b4
tree4ef2b0dd09d14bcbe3c04c2b8e47e046c4bacc0a
parent961f4ee0d6c2589643d43d8580b49c8671976974
parent699d48a204bd4d798a7d3928b1d75b0c44801235
Merge branch 'master' of github.com:FreeRDP/FreeRDP-1.0