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)
commit1e63d71c91c8c4ecf048adc719c7158630d5d063
treed5a13f95839be409b3243d61a167b4e7415e16c2
parent12c00057e7a4b279ad245d54d906e74a899aec4b
parentd6205749eb5a9ef1991c2313ab2b3bffbc2753d5
Merge branch 'master' of gitorious.org:owncloud/android-devel
AndroidManifest.xml