Merge branch 'master' of gitorious.org:owncloud/android-devel
authorBartek Przybylski <bart.p.pl@gmail.com>
Sat, 19 May 2012 17:08:39 +0000 (19:08 +0200)
committerBartek Przybylski <bart.p.pl@gmail.com>
Sat, 19 May 2012 17:08:39 +0000 (19:08 +0200)

Trivial merge