Merge branch 'develop' of https://github.com/tobiasKaminsky/android into develop
authortobiasKaminsky <tobias@kaminsky.me>
Sat, 9 Aug 2014 08:20:07 +0000 (10:20 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Sat, 9 Aug 2014 08:20:07 +0000 (10:20 +0200)
commit8c96447fe75afb512621a6c6bb134aa6852e9162
tree95d7441627abcb6359e7181782cac00375cbb2f4
parentd15e5cce063c60b37ec054fa4f7e325670b7d205
parentc0dc4c42d71eb9593ff48a02a8af74bd7df8776e
Merge branch 'develop' of https://github.com/tobiasKaminsky/android into develop

Conflicts:
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java