From: masensio Date: Fri, 21 Mar 2014 09:37:11 +0000 (+0100) Subject: Merge branch 'develop' into improve_notifications_pr_400_with_develop X-Git-Tag: oc-android-1.5.5~5^2~4^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7ed317910043b9688ec95462e3b35e2b57aacb60 Merge branch 'develop' into improve_notifications_pr_400_with_develop --- 7ed317910043b9688ec95462e3b35e2b57aacb60