owncloud/core — pull request #3156 by FlorinPeter (2013-04-28 19:00:50+00:00)
Title: Trashbin for encryption keys now against master

@schiesbn the changes should go to the master and not to the stable5, after merge we can merge the master to files_encryption branch so development will be easier.
@LukasReschke this should hopefully be ok now?