From: masensio Date: Tue, 29 Oct 2013 13:13:24 +0000 (+0100) Subject: Merge branch 'develop' into setup_buttons X-Git-Tag: oc-android-1.5.5~139^2~14 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c2abbaaedb69dba35866a48b745b68f3519cbca1?ds=sidebyside;hp=--cc Merge branch 'develop' into setup_buttons --- c2abbaaedb69dba35866a48b745b68f3519cbca1