Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sun, 20 Jan 2013 00:45:12 +0000 (19:45 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sun, 20 Jan 2013 00:45:12 +0000 (19:45 -0500)
1  2 
libfreerdp/core/update.c

Simple merge