Merge branch 'master' of gitorious.org:owncloud/android-devel
authorBartek Przybylski <bart.p.pl@gmail.com>
Sat, 30 Jun 2012 11:51:31 +0000 (13:51 +0200)
committerBartek Przybylski <bart.p.pl@gmail.com>
Sat, 30 Jun 2012 11:51:31 +0000 (13:51 +0200)
1  2 
AndroidManifest.xml

Simple merge