From: masensio <masensio@solidgear.es>
Date: Mon, 24 Feb 2014 12:16:57 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.5.5~35
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/271078a4039f3c674462f929bc97528901e41e64?hp=271078a4039f3c674462f929bc97528901e41e64

Merge branch 'master' into develop
---