Merge branch 'stable-3.1'

* stable-3.1:
  Submit: Get the change Id from the patch set Id

Change-Id: Idbd71d8908e99e385fd08d548e915f3c76a0766e
diff --git a/src/main/resources/Documentation/hooks.md b/src/main/resources/Documentation/hooks.md
index b7e092c..70bf2c5 100644
--- a/src/main/resources/Documentation/hooks.md
+++ b/src/main/resources/Documentation/hooks.md
@@ -54,6 +54,12 @@
 
 Called whenever a patchset is created (this includes new changes).
 
+New patchsets do not generate this event when created as a result of merging a change
+(see change-merged for this). Examples are:
+* Submitting a change
+* Merging a change
+* Closing a change by direct push to branch
+
 ```
   patchset-created --change <change id> --kind <change kind> --change-url <change url> --change-owner <change owner> --change-owner-username <username> --project <project name> --branch <branch> --topic <topic> --uploader <uploader> --uploader-username <username> --commit <sha1> --patchset <patchset id>
 ```