Merge branch '559_longpress_filename' of https://github.com/owncloud/android into...
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 8 Sep 2015 11:53:24 +0000 (13:53 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 8 Sep 2015 11:53:24 +0000 (13:53 +0200)

Trivial merge