Merge branch 'master' of gitorious.org:owncloud/owncloud v4.0.0RC2
authorFrank Karlitschek <frank@owncloud.org>
Fri, 18 May 2012 19:16:03 +0000 (21:16 +0200)
committerFrank Karlitschek <frank@owncloud.org>
Fri, 18 May 2012 19:16:03 +0000 (21:16 +0200)
commite03b5ff6653ca7334f24bf2000eacdbad4c99bf8
tree1f135bd0ebda91324fa297b62c6fab0c9fa3cac6
parentfdbe0c97340f9ebc92c083d0aade3f431d46cce0
parentea7456a06a8934b77cb3ede753638276bacebde7
Merge branch 'master' of gitorious.org:owncloud/owncloud