Merge branch 'master' of ssh://git@gitorious.org/owncloud/android-devel.git
authorLennart Rosam <lennart@familie-rosam.de>
Wed, 23 May 2012 21:51:27 +0000 (23:51 +0200)
committerLennart Rosam <lennart@familie-rosam.de>
Wed, 23 May 2012 21:51:27 +0000 (23:51 +0200)

Trivial merge