From: masensio <masensio@solidgear.es>
Date: Thu, 29 May 2014 07:22:16 +0000 (+0200)
Subject: Merge branch 'develop' into vanish_notifications
X-Git-Tag: oc-android-1.7.0_signed~294^2~9
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3404807324ee2157d972832bef4c4981b86de492?hp=--cc

Merge branch 'develop' into vanish_notifications
---

3404807324ee2157d972832bef4c4981b86de492