Merge branch 'master' of ssh://gitorious.org/owncloud/android-devel
authorLennart Rosam <lennart@familie-rosam.de>
Thu, 28 Jun 2012 12:49:54 +0000 (14:49 +0200)
committerLennart Rosam <lennart@familie-rosam.de>
Thu, 28 Jun 2012 12:49:54 +0000 (14:49 +0200)

Trivial merge