From: Thomas Müller Date: Thu, 13 Mar 2014 10:01:19 +0000 (+0100) Subject: Merge branch 'develop' into introduce-travis-ci X-Git-Tag: oc-android-1.5.5~12^2~4 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c0b85157a9c44a6374e749984e8a55d45868998f?ds=inline;hp=--cc Merge branch 'develop' into introduce-travis-ci --- c0b85157a9c44a6374e749984e8a55d45868998f