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)
commit2e247f24bf47d1224131bea60351709fd45bce31
tree7ec8aa152d561f5f654384263d4fe37a6889abae
parent6373cfbb5a13bf63f18432850a15978365ac20a2
parent114e0c25213d812506c1d976fe568fbaf23b3e2b
Merge branch 'master' of ssh://gitorious.org/owncloud/android-devel