Merge branch 'maint/add-py26-deprecation-warning' of https://github.com/OpenKMIP/PyKMIP into maint/add-py26-deprecation-warning

Browse Source

Conflicts:
	kmip/__init__.py

...

This commit is contained in:

Peter 2016-01-14 16:42:10 -05:00

parent b7add2179d 8ca3d59e37

commit faf5634cc0

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available