core: Correct handling of MultifragMaxRequestSize (Fixes #1022)
Merge remote-tracking branch 'upstream/master'
Android: Add basic .RDP file support
Android: Fix build
client/Android: fix keyboard
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
freerdp: merging with master