Merge branch 'master' of github.com:owncloud/android
authormasensio <masensio@solidgear.es>
Mon, 24 Aug 2015 10:42:25 +0000 (12:42 +0200)
committermasensio <masensio@solidgear.es>
Mon, 24 Aug 2015 10:42:25 +0000 (12:42 +0200)

Trivial merge