Merge remote-tracking branch 'origin/master' into moresync
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 9 Jul 2012 09:28:51 +0000 (11:28 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 9 Jul 2012 09:28:51 +0000 (11:28 +0200)
commitcbf9ca8beac99dc06678d13c5f80804d56445472
tree0cf6223016527003329a4cca5cd30193002af742
parenta48014bffde47d6714ec72b1fe1051dcd44c850d
parent93de9f91d56ec3ff6ccd1d26df75dc1293e861bb
Merge remote-tracking branch 'origin/master' into moresync
AndroidManifest.xml
src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java