Marc-André Moreau 915b9a15b1 Merge branch 'master' of github.com:FreeRDP/FreeRDP
Conflicts:
	winpr/libwinpr/bcrypt/CMakeLists.txt
2016-05-11 11:05:17 -04:00
..
2016-05-02 17:44:25 +02:00
2016-03-29 18:14:34 +02:00
2016-05-02 16:10:31 +02:00