From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 21 May 2015 19:12:44 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update
X-Git-Tag: oc-android-1.7.2~1^2~23^2~42
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6d4207a06bfa0a1bb19b8d5942b799dadfbbe608?hp=6d4207a06bfa0a1bb19b8d5942b799dadfbbe608

Merge remote-tracking branch 'upstream/develop' into navigationDrawer_update
---