From: David A. Velasco Date: Tue, 4 Feb 2014 13:22:23 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/develop' into develop X-Git-Tag: oc-android-1.5.5~62 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3738df0e8cf9b6d6115ba521e97147e7bc07cca8?ds=inline;hp=-c Merge remote-tracking branch 'origin/develop' into develop --- 3738df0e8cf9b6d6115ba521e97147e7bc07cca8