Merge branch 'v0.4'

Conflicts:
	doc/api/crypto.markdown
	doc/api/modules.markdown
	src/platform_win32.cc

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/crypto.js b/lib/crypto.js
index d7f403ed100..83b2bb8122e 100644
--- a/lib/crypto.js
+++ b/lib/crypto.js
@@ -118,8 +118,8 @@ exports.createHmac = function(hmac, key) {
 
 
 exports.Cipher = Cipher;
-exports.createCipher = function(cipher, key) {
-  return (new Cipher).init(cipher, key);
+exports.createCipher = function(cipher, password) {
+  return (new Cipher).init(cipher, password);
 };
 
 
@@ -129,8 +129,8 @@ exports.createCipheriv = function(cipher, key, iv) {
 
 
 exports.Decipher = Decipher;
-exports.createDecipher = function(cipher, key) {
-  return (new Decipher).init(cipher, key);
+exports.createDecipher = function(cipher, password) {
+  return (new Decipher).init(cipher, password);
 };