From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 2 Jul 2012 08:42:07 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: oc-android-1.4.3~323^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/16b5c6b9ad29bee58dec8aa301b21a2992d63d00?ds=sidebyside

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

16b5c6b9ad29bee58dec8aa301b21a2992d63d00