Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
authorJörn Friedrich Dreyer <jfd@butonic.de>
Fri, 24 Aug 2012 22:06:20 +0000 (00:06 +0200)
committerJörn Friedrich Dreyer <jfd@butonic.de>
Fri, 24 Aug 2012 22:06:20 +0000 (00:06 +0200)
commitfd5af9aff4245127f32f3b90dbd6e52792984447
treef77a3b903067f05f036578835700f262f6ea71a9
parentc8255a170c2d7449b4e7728edd2237eea71dca80
parentd84b1adf34817b4b261db35e51f72ac78adf8e27
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support