From: masensio <masensio@solidgear.es>
Date: Mon, 26 Aug 2013 08:19:02 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.4.6~19
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/f8d6d882b07f15463a0bed0a5c1500c043f0aa4f

Merge branch 'master' into develop
---

f8d6d882b07f15463a0bed0a5c1500c043f0aa4f