From: David A. Velasco Date: Tue, 8 Apr 2014 07:23:29 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/fixing_travis' into fixing_travis X-Git-Tag: oc-android-1.7.0_signed~336^2~1 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/44b61b3fe785bfbd00f0264cd57bedad19acdcea?ds=inline;hp=--cc Merge remote-tracking branch 'origin/fixing_travis' into fixing_travis --- 44b61b3fe785bfbd00f0264cd57bedad19acdcea