Marc-André Moreau 83ad1730b8 Merge branch 'master' of github.com:FreeRDP/FreeRDP
Conflicts:
	libfreerdp/core/input.c
	libfreerdp/core/update.c
2013-11-23 16:39:29 -05:00
..
2013-04-03 01:12:39 +02:00
2013-05-28 01:14:20 -04:00
2013-08-05 20:50:23 -04:00
2013-06-05 14:59:24 -04:00