Merge branch 'master' of https://github.com/owncloud/android into fix_1192_date_time
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 16 Oct 2015 08:42:02 +0000 (10:42 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 16 Oct 2015 08:42:02 +0000 (10:42 +0200)
commitbe83702fd7ba3dfb676b38d301fd55a5344ca4ea
treed319c72eb4a2e67baa96cf7172fc3850597e51ec
parentae6194ffee024b3267373b60f3baf81b3d8c4069
parentbe3b6a53b938c07f593a2bd8ddfe6f72d3524117
Merge branch 'master' of https://github.com/owncloud/android into fix_1192_date_time