From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 18 Dec 2012 10:20:03 +0000 (+0100)
Subject: Merge master into oauth_login
X-Git-Tag: oc-android-1.4.3~29^2~25
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c38a3b2ef12a3f6b4b1f0dad611d31cbd0686793?hp=c38a3b2ef12a3f6b4b1f0dad611d31cbd0686793

Merge master into oauth_login
---