Merge branch 'master' of ssh://git@gitorious.org/owncloud/android-devel.git
authorLennart Rosam <lennart@familie-rosam.de>
Thu, 17 May 2012 22:43:47 +0000 (00:43 +0200)
committerLennart Rosam <lennart@familie-rosam.de>
Thu, 17 May 2012 22:43:47 +0000 (00:43 +0200)

Trivial merge