Merge remote-tracking branch 'theirs/develop' into gradleWithInternalDependency
authorMMMarcy <steiner.marcello@gmail.com>
Fri, 17 Oct 2014 12:58:27 +0000 (14:58 +0200)
committerMMMarcy <steiner.marcello@gmail.com>
Fri, 17 Oct 2014 12:58:27 +0000 (14:58 +0200)
commitd8d75623e49a10942c5d02137032c40984c674ea
tree09543e422e552d2cd909ed7ee00a33d53d2bcc1c
parent0775b10a04ed6bf657dc5a73d037aaafebfcfd75
parent95a02855eeb20c88acab1a8c19d09df7cadb2bb0
Merge remote-tracking branch 'theirs/develop' into gradleWithInternalDependency

Conflicts:
owncloud-android-library
pom.xml
owncloud-android-library
pom.xml
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/operations/CreateShareOperation.java
src/com/owncloud/android/operations/GetSharesForFileOperation.java