Merge branch 'master' of gitorious.org:owncloud/android-devel
authorBartek Przybylski <bart.p.pl@gmail.com>
Mon, 25 Jun 2012 17:46:31 +0000 (19:46 +0200)
committerBartek Przybylski <bart.p.pl@gmail.com>
Mon, 25 Jun 2012 17:46:31 +0000 (19:46 +0200)

Trivial merge