Merge branch 'develop' of git@github.com:owncloud/android.git into
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 21 Nov 2014 16:58:01 +0000 (17:58 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 21 Nov 2014 16:58:01 +0000 (17:58 +0100)
commitb2158a8673b5a558cbb6e8f754196c9b5d96ede4
tree471ccd424129277a5a459f9dd626092b9b822d10
parent462d032625db7668dafb027d5e0915139ac2d64d
parente901b609baa4dd5f681e2a5257c9e504997e3377
Merge branch 'develop' of git@github.com:owncloud/android.git into
developNew

Conflicts:
res/values-fr/strings.xml
owncloud-android-library
res/values-fr/strings.xml