core: Correct handling of MultifragMaxRequestSize (Fixes #1022)
Merge remote-tracking branch 'upstream/master'
Android: Add basic .RDP file support
Android: Fix build
add Password Dialog files
client/Android: fix keyboard
MacFreeRDP: hook up password dialog
MacFreeRDP: use CoreGraphics for drawing
Merge branch 'mac' of git://github.com/zeha/FreeRDP
mfreerdp: make use of libwinpr-input
mfreerdp: fix icon file
Merge remote-tracking branch 'upstream/master'
locale: Fix compile error on Windows
Merge pull request #1065 from blazee/android_rdpfile

Android rdpfile
Merge pull request #1067 from mfleisz/kbdwinfix

locale: Fix compile error on Windows
mfreerdp: code style cleanup
freerdp: merging with master
Merge pull request #1070 from awakecoding/master

MFreeRDP Fixes, Sound Refactoring
Merge remote-tracking branch 'upstream/master'