From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 13 Aug 2014 10:34:21 +0000 (+0200)
Subject: Merge pull request #9754 from owncloud/enc_support_aes_256
X-Git-Tag: v8.0.0alpha1~915
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f282a5cff00d2e7ecbfaa0d93d7ab0bf30921701;p=nextcloud-server.git

Merge pull request #9754 from owncloud/enc_support_aes_256

[encryption] support aes 256
---

f282a5cff00d2e7ecbfaa0d93d7ab0bf30921701