Merge branch 'master' into oauth_login
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 17 Jan 2013 13:25:49 +0000 (14:25 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 17 Jan 2013 13:25:49 +0000 (14:25 +0100)
commit2b5785556e7f7c3cefc5f084949e091f80abed6d
treea2a2a7ea726f87e5906c3985599448a2bf4e6272
parent73f8797b7572e431037fd5ee55c24237c544dfcb
parentc4cd9ef44c48f39767828a97e1cf6bbddd71c855
Merge branch 'master' into oauth_login

Conflicts:
AndroidManifest.xml
res/values-de-rDE/strings.xml
res/values-de/strings.xml
res/values/strings.xml
src/com/owncloud/android/Uploader.java
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/files/OwnCloudFileObserver.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/RemoteOperationResult.java
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/UploadFilesActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
AndroidManifest.xml
res/values/strings.xml
src/com/owncloud/android/Uploader.java
src/com/owncloud/android/files/OwnCloudFileObserver.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/RemoteOperationResult.java
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java