Merge changes from upstream

gjtorikian · gjtorikian · commit 44587ee11cfd · 2014-07-24T11:26:37.000-07:00
diff --git a/content/v3/activity/events/types.md b/content/v3/activity/events/types.md
@@ -321,7 +321,7 @@ Triggered when a [pull request](/v3/pulls) is created, closed, reopened or synch
 
 Key | Type | Description
 ----|------|-------------
-`action`|`string` | The action that was performed. Can be one of "opened", "closed", "synchronize", or "reopened". If the action is "closed" and the `merged_at` key is `null`, the pull request was closed with unmerged commits. If the action is "closed" and the `merged_at` key is a timestamp, the pull request was merged.
+`action`|`string` | The action that was performed. Can be one of "opened", "closed", "synchronize", or "reopened". If the action is "closed" and the `merged` key is `false`, the pull request was closed with unmerged commits. If the action is "closed" and the `merged` key is `true`, the pull request was merged.
 `number`|`integer` | The pull request number.
 `pull_request`|`object` | The [pull request](/v3/pulls) itself.
 
