From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 30 Jan 2013 15:17:41 +0000 (+0100)
Subject: Merge branch 'master' into temporal_icons
X-Git-Tag: oc-android-1.4.3~58
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/13b75b73e3dcd7c6794f9beee4a538fc900bc94d?hp=-c

Merge branch 'master' into temporal_icons
---

13b75b73e3dcd7c6794f9beee4a538fc900bc94d