Merge with default

Rob Harrop · Rob Harrop · commit 7dc7740267fa · 2011-01-14T11:51:31.000Z
diff --git a/docs/specs/amqp0-9-1.xml b/docs/specs/amqp0-9-1.xml
@@ -1970,6 +1970,7 @@
                           / S:DELIVER content
                           / C:GET ( S:GET-OK content / S:GET-EMPTY )
                           / C:ACK
+                          / S:ACK
                           / C:REJECT
                           / C:NACK
                           / C:RECOVER-ASYNC
