Merge remote-tracking branch 'origin/fixing_travis' into fixing_travis
[pub/Android/ownCloud.git] / res / values-ast /
2014-04-08 David A. VelascoMerge remote-tracking branch 'origin/fixing_travis...
2014-04-08 masensioMerge pull request #458 from owncloud/operations_service
2014-04-08 Mr. Jenkins[tx-robot] updated from transifex