Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 22 Jun 2015 09:23:05 +0000 (11:23 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 22 Jun 2015 09:23:05 +0000 (11:23 +0200)
commit8981be0c716430d58ac00955c6b1db367e60efcd
tree516d593ba9d9082289023a71aec5f06ae4150379
parenta860ff6f96777af42687fa727d9093d3edf2c4d6
parentf606fe97c5a2f926180cc4e2419aac21d6213396
Merge branch 'master' into develop

Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
owncloud-android-library