dcoppa 2005edfdc6 Merge some fixes from upstream repo:
Fix always-true conditional

Remove unneeded conversion from CMD4Hash

Fix a shadow warning
2015-01-29 14:46:28 +00:00
..
2015-01-29 14:46:28 +00:00