From: David A. Velasco Date: Mon, 2 Dec 2013 12:44:08 +0000 (+0100) Subject: Merge branch 'develop' into sni_support_based_on_network_implementation_built_in X-Git-Tag: oc-android-1.5.5~113^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/04e2434affd5a7fd187f955abc25fa3dc2de183b?ds=inline;hp=-c Merge branch 'develop' into sni_support_based_on_network_implementation_built_in --- 04e2434affd5a7fd187f955abc25fa3dc2de183b