From: masensio <masensio@solidgear.es>
Date: Mon, 18 May 2015 13:04:15 +0000 (+0200)
Subject: Merge branch 'develop' into navigation_drawer
X-Git-Tag: test~7
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/25718e7992ac273156f58d679ffc2cf3dad0c3c3?ds=inline;hp=--cc

Merge branch 'develop' into navigation_drawer
---

25718e7992ac273156f58d679ffc2cf3dad0c3c3