Merge branch 'bug_hunting' into feature_previews
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 4 Apr 2013 14:49:04 +0000 (16:49 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 4 Apr 2013 14:49:04 +0000 (16:49 +0200)
commit053aad5ae17a1ad7a15218c220810e6b369fea4c
treeba33117ddb233b186897bff0b6800c6f94b1ff5e
parent77ddd1ccb62e8b70580b8f410dda703a269f224f
parent97ae9007e465ef352bdc5860db499e1cd21089ff
Merge branch 'bug_hunting' into feature_previews

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