Marc-André Moreau 85b1d6c167 Merge branch 'master' of github.com:FreeRDP/FreeRDP
Conflicts:
	libfreerdp/codec/h264.c
2014-08-05 09:55:54 -04:00
..
2014-04-29 10:32:16 +02:00
2014-03-05 14:49:00 +02:00
2014-07-02 14:30:04 -06:00