From: David A. Velasco Date: Wed, 19 Jun 2013 10:17:16 +0000 (+0200) Subject: Merge branch 'fixed_contradicted_messages_in_login_view' into develop X-Git-Tag: oc-android-1.4.3~16 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0c7f1af8d05cb44b9f76e57dda28976427123f65?ds=inline;hp=--cc Merge branch 'fixed_contradicted_messages_in_login_view' into develop --- 0c7f1af8d05cb44b9f76e57dda28976427123f65