Merge branch 'master' of ssh://git@gitorious.org/owncloud/android-devel.git
authorLennart Rosam <lennart@familie-rosam.de>
Tue, 3 Jul 2012 20:50:52 +0000 (22:50 +0200)
committerLennart Rosam <lennart@familie-rosam.de>
Tue, 3 Jul 2012 20:50:52 +0000 (22:50 +0200)

Trivial merge