From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 9 Oct 2012 12:54:14 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: oc-android-1.4.3~163
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/38512099c49a32406725086074ac4973220807c1?hp=--cc

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

38512099c49a32406725086074ac4973220807c1