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)
1  2 
AndroidManifest.xml
src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java

Simple merge