Merge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into files_encryption_upgrade_fix

This commit is contained in:
Björn Schießle 2013-06-13 10:49:23 +02:00
commit fd5042cc46
1 changed files with 1 additions and 1 deletions

@ -1 +1 @@
Subproject commit a13af72fbe8983686fc47489a750e60319f68ac2
Subproject commit 3ef9f738a9107879dddc7d97842cf4d2198fae4c