From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 29 Jun 2012 08:36:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: oc-android-1.4.3~326
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1f0fc5470a363e5af050ee87a1c6565602645832

Merge remote-tracking branch 'origin/master'
---

1f0fc5470a363e5af050ee87a1c6565602645832