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


No differences found