From: masensio <masensio@solidgear.es>
Date: Wed, 9 Apr 2014 06:42:30 +0000 (+0200)
Subject: Merge branch 'develop' into videoInstandUploads
X-Git-Tag: oc-android-1.7.0_signed~332^2~7
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1a33e4cf6582c480be3097fcd65fb7ccd876f51a?ds=sidebyside

Merge branch 'develop' into videoInstandUploads
---

1a33e4cf6582c480be3097fcd65fb7ccd876f51a