Merge branch 'master' of git@github.com:FreeRDP/FreeRDP-1.0
authorJay Sorg <jay.sorg@gmail.com>
Sun, 10 Jul 2011 02:55:34 +0000 (19:55 -0700)
committerJay Sorg <jay.sorg@gmail.com>
Sun, 10 Jul 2011 02:55:34 +0000 (19:55 -0700)
commit55e37be812ab94e0def7d64a5c057dd48a2a848c
tree1e7ef2d5608a0bfa73d5383f918ffacb330b0db4
parent19223a2503ace70afc6c223520b8e56af76c73da
parenteb18fd08977b4c18819b127f3eb66b420d69b0d0
Merge branch 'master' of git@github.com:FreeRDP/FreeRDP-1.0