Merge branch 'release-v0.29.0' of https://github.com/matrix-org/synapse into release-v0.29.0

CHANGES.rst

+Changes in synapse v0.29.1 (2018-05-17)
+==========================================
+Changes:
+
+* Update docker documentation (PR #3222)
+
 Changes in synapse v0.29.0 (2018-05-16)
 ===========================================
-
+Not changes since v0.29.0-rc1
 
 Changes in synapse v0.29.0-rc1 (2018-05-14)
 ===========================================

synapse/__init__.py

@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.29.0"
+__version__ = "0.29.1"