Merge branch '1.14' into 1.15

Conflicts:
	sites/www/changelog.rst

1 files changed, 0 insertions, 9 deletions

diff --git a/paramiko/util.py b/paramiko/util.py
index 9befc63b..d9a29d74 100644
--- a/paramiko/util.py
+++ b/paramiko/util.py
@@ -23,7 +23,6 @@ Useful functions used by the rest of paramiko.
 from __future__ import generators
 
 import array
-from binascii import hexlify, unhexlify
 import errno
 import sys
 import struct
@@ -106,14 +105,6 @@ def format_binary_line(data):
     return '%-50s %s' % (left, right)
 
 
-def hexify(s):
-    return hexlify(s).upper()
-
-
-def unhexify(s):
-    return unhexlify(s)
-
-
 def safe_string(s):
     out = b('')
     for c in s: