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)
Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java


No differences found