From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 11 Jul 2012 16:47:27 +0000 (+0200)
Subject: Merge branch 'master', remote-tracking branch 'origin'
X-Git-Tag: oc-android-1.4.3~289
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/f692bf7ae67b050345c14ec5e914cb3b1c0a950b

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

f692bf7ae67b050345c14ec5e914cb3b1c0a950b