Merge branch 'master' into php5

* master:
  Add Blowfish and Twofish as composer keywords.
This commit is contained in:
Andreas Fischer 2013-11-26 19:35:49 +01:00
commit 6e10eb195d

View File

@ -11,6 +11,8 @@
"signing", "signing",
"rsa", "rsa",
"aes", "aes",
"blowfish",
"twofish",
"ssh", "ssh",
"sftp", "sftp",
"x509", "x509",