Patch to address owncloud/android#57
Merge branch 'master' of github.com:s17t/owncloud