Merge pull request #1474 from samtuke/master

apps/files_encryption/appinfo/app.php

apps/files_encryption/appinfo/spec.txt

apps/files_encryption/appinfo/version

apps/files_encryption/hooks/hooks.php

apps/files_encryption/lib/crypt.php

apps/files_encryption/lib/keymanager.php

apps/files_encryption/lib/proxy.php

apps/files_encryption/lib/session.php

apps/files_encryption/lib/stream.php

apps/files_encryption/lib/util.php

apps/files_encryption/settings-personal.php

apps/files_encryption/templates/settings-personal.php

apps/files_encryption/templates/settings.php

apps/files_encryption/test/crypt.php

apps/files_encryption/test/keymanager.php

apps/files_encryption/test/util.php

lib/files/filesystem.php

lib/public/share.php