Merge branch 'master' of git://github.com/FreeRDP/FreeRDP
authorHardening <rdp.effort@gmail.com>
Sun, 14 Apr 2013 13:46:23 +0000 (15:46 +0200)
committerHardening <rdp.effort@gmail.com>
Sun, 14 Apr 2013 13:46:23 +0000 (15:46 +0200)
1  2 
winpr/include/winpr/stream.h

Simple merge