Merge branch 'bug_hunting' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 12 Apr 2013 10:34:17 +0000 (12:34 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 12 Apr 2013 10:34:17 +0000 (12:34 +0200)
commit8aeb5243b70ad931aaef7b88b5f52f054cd4171b
treebd2485d5ab51a6772117f78057adfd6150642d82
parent4cb97d239030f5c7085cef0d5b45ff686f58473f
parent7edc384f7eb5c469ebfcb82c0017f9d74335bace
Merge branch 'bug_hunting' into develop

Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
AndroidManifest.xml
res/values-de-rDE/strings.xml
res/values-de/strings.xml
res/values/strings.xml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java