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-11-08 10:27:16 +01:00
2013-11-12 15:18:18 +01:00
2013-11-12 15:18:35 +01:00
2013-11-03 19:10:33 -05:00
2013-11-21 15:11:42 +01:00