From: masensio <masensio@solidgear.es>
Date: Fri, 30 May 2014 10:40:55 +0000 (+0200)
Subject: Merge branch 'master' into vanish_notifications
X-Git-Tag: oc-android-1.7.0_signed~294^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/dbfbc10af43b10fc23e56fa62ef0cde6df71f0e4?ds=sidebyside

Merge branch 'master' into vanish_notifications
---

dbfbc10af43b10fc23e56fa62ef0cde6df71f0e4