From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 31 Oct 2013 16:10:09 +0000 (+0100)
Subject: Merge branch 'develop' into clean_up
X-Git-Tag: oc-android-1.5.5~144^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/bb34e0f480f65e3a773df107b5d2267999e463cb?hp=bb34e0f480f65e3a773df107b5d2267999e463cb

Merge branch 'develop' into clean_up
---