Merge branch 'master' of https://github.com/owncloud/android into develop
authorAndyScherzinger <info@andy-scherzinger.de>
Sun, 26 Jul 2015 20:34:13 +0000 (22:34 +0200)
committerAndyScherzinger <info@andy-scherzinger.de>
Sun, 26 Jul 2015 20:34:13 +0000 (22:34 +0200)
commitfcf4f1238da1b084aafdb88753eed511b948b54b
tree261c7c476c2d2d80124b214283c9f80ba0804767
parent82f4123260d6b1c2abd72f52979c97cd620af7cc
parentc9c0684cbce3c1be6cf61f226edd3bf53e04429f
Merge branch 'master' of https://github.com/owncloud/android into develop