From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 26 Jun 2013 16:11:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: oc-android-1.4.3~12^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a957efbd3df9bc957b078f3a12b47ca3258cb699?ds=sidebyside

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

a957efbd3df9bc957b078f3a12b47ca3258cb699