From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 31 Jan 2013 11:50:03 +0000 (+0100)
Subject: Merge branch 'master' into temporal_icons
X-Git-Tag: oc-android-1.4.3~57
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/82ee5c46eea51198eb055eec84526673fd04e977

Merge branch 'master' into temporal_icons
---

82ee5c46eea51198eb055eec84526673fd04e977