From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 15 Apr 2015 10:16:24 +0000 (+0200)
Subject: Merge branch 'develop' into upgrading_account_manager
X-Git-Tag: test~30^2~12^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4457dbd3177fb6084f801187c35e09008bcd3b50?ds=sidebyside;hp=4457dbd3177fb6084f801187c35e09008bcd3b50

Merge branch 'develop' into upgrading_account_manager
---