Merge branch 'release'

author David Bremner <david@tethera.net>

Thu, 1 Jun 2017 10:54:38 +0000 (07:54 -0300)

committer David Bremner <david@tethera.net>

Thu, 1 Jun 2017 10:54:38 +0000 (07:54 -0300)
author David Bremner <david@tethera.net>
Thu, 1 Jun 2017 10:54:38 +0000 (07:54 -0300)
committer David Bremner <david@tethera.net>
Thu, 1 Jun 2017 10:54:38 +0000 (07:54 -0300)
diff --cc bindings/python/notmuch/version.py

index bfdcf7ed32cca758e67bb4ea8c6418851422a47b,49bca3475f4caa7954aa2de8bd9c4767a5f5a89a..6101902b8ecd20a8a79af1cb77cc4d189fe83d35
--- 1/bindings/python/notmuch/version.py
--- 2/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@@ -1,3 -1,3 +1,3 @@@
   # this file should be kept in sync with ../../../version
- __VERSION__ = '0.24.1'
+ __VERSION__ = '0.24.2'
- -SOVERSION = '4'
+ +SOVERSION = '5'
diff --cc notmuch-dump.c
Simple merge
author	David Bremner <david@tethera.net>
	Thu, 1 Jun 2017 10:54:38 +0000 (07:54 -0300)
committer	David Bremner <david@tethera.net>
	Thu, 1 Jun 2017 10:54:38 +0000 (07:54 -0300)
		1	2
bindings/python/notmuch/version.py	patch \|	diff1 \|	diff2 \|	blob \| history
notmuch-dump.c	patch \|	diff1 \|	diff2 \|	blob \| history