Merge remote-tracking branch 'dweismueller/owncloud-7' into next

This commit is contained in:
Michael Tremer
2014-07-30 13:15:33 +02:00
2 changed files with 3294 additions and 844 deletions

File diff suppressed because it is too large Load Diff