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)
commit6d83b3503b71b33f010a801a3f000341f8e91954
tree88c8c3b89305c40b8800da7adf9a2ce8993a67e8
parente6f9fc1480b1ae800fc37e6b16647d6de774db47
parentd0c9ad1091a1a161faf45583ff454622a05d6452
Merge branch 'develop' of github.com:owncloud/android into setup_md