Merge branch 'master' of gitorious.org:owncloud/android-devel
authorBartek Przybylski <bart.p.pl@gmail.com>
Tue, 26 Jun 2012 16:08:49 +0000 (18:08 +0200)
committerBartek Przybylski <bart.p.pl@gmail.com>
Tue, 26 Jun 2012 16:08:49 +0000 (18:08 +0200)

Trivial merge