Marc-André Moreau 02646b349f Merge branch 'master' of github.com:FreeRDP/FreeRDP
Conflicts:
	libfreerdp/core/gcc.c
2014-10-25 10:29:06 -04:00
..
2014-10-17 12:08:39 +02:00
2014-09-15 08:55:00 +02:00
2014-10-17 00:08:15 +09:00