From: masensio Date: Mon, 26 Aug 2013 08:20:59 +0000 (+0200) Subject: Merge branch 'master' into saml_based_federated_single_sign_on_expired X-Git-Tag: oc-android-1.4.6~17^2~4 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5066193e58ea77f0a507d790f9487fc3269ae3b0?ds=inline;hp=--cc Merge branch 'master' into saml_based_federated_single_sign_on_expired --- 5066193e58ea77f0a507d790f9487fc3269ae3b0