Merge branch 'develop' of github.com:owncloud/android into setup_md
authorLuke Owncloud <owncloud@ohrt.org>
Thu, 24 Oct 2013 07:19:03 +0000 (09:19 +0200)
committerLuke Owncloud <owncloud@ohrt.org>
Thu, 24 Oct 2013 07:19:03 +0000 (09:19 +0200)

Trivial merge