Merge branch 'master' of https://github.com/jeremysolarz/jcommander into issue-306-empty-string-as-parameter

* 'master' of https://github.com/jeremysolarz/jcommander:
  Add changelog entry for #305
  Do not display default value for help parameter in usage
  Finalize test case for omitting of default value display in usage output

# Conflicts:
#	CHANGELOG.md
#	src/main/java/com/beust/jcommander/JCommander.java

1 files changed, 1 insertions, 1 deletions

diff --git a/src/main/java/com/beust/jcommander/JCommander.java b/src/main/java/com/beust/jcommander/JCommander.java
index 45aff0e..03752a7 100644
--- a/src/main/java/com/beust/jcommander/JCommander.java
+++ b/src/main/java/com/beust/jcommander/JCommander.java
@@ -1036,7 +1036,7 @@ public class JCommander {
                                 + "key" + parameter.getAssignment()
                                 + "value");
             }
-            if (def != null) {
+            if (def != null && !pd.isHelp()) {
                 String displayedDef = Strings.isStringEmpty(def.toString())
                         ? "<empty string>"
                         : def.toString();