From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 1 Jul 2014 12:21:26 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/develop' into add_cookie_based_session_support
X-Git-Tag: oc-android-1.7.0_signed~264^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/dacc14a882be8b499c00ad2f75b68e10a42dee9e?hp=dacc14a882be8b499c00ad2f75b68e10a42dee9e

Merge remote-tracking branch 'origin/develop' into add_cookie_based_session_support
---