Merge branch '1182_Open_With_Fix' of https://github.com/owncloud/android into materia...
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 5 Oct 2015 16:51:53 +0000 (18:51 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 5 Oct 2015 16:51:53 +0000 (18:51 +0200)

Trivial merge