Merge branch 'release-1.8' of github.com:owncloud/android into release-1.8
authormasensio <masensio@solidgear.es>
Wed, 16 Sep 2015 10:55:45 +0000 (12:55 +0200)
committermasensio <masensio@solidgear.es>
Wed, 16 Sep 2015 10:55:45 +0000 (12:55 +0200)

Trivial merge