From: masensio <masensio@solidgear.es>
Date: Mon, 26 Aug 2013 08:19:37 +0000 (+0200)
Subject: Merge branch 'master' into saml_based_federated_single_sign_on
X-Git-Tag: oc-android-1.4.6~18^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0a7d508f92c758a47376bf833c54c2511482f1f4

Merge branch 'master' into saml_based_federated_single_sign_on
---

0a7d508f92c758a47376bf833c54c2511482f1f4