Merge branch 'master' into develop
[pub/Android/ownCloud.git] / res / values-mr /
2015-02-19 David A. VelascoMerge branch 'master' into develop
2015-02-17 Jenkins for ownCloud[tx-robot] updated from transifex