From: David Bremner <david@tethera.net>
Date: Thu, 1 Jun 2017 10:54:38 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.25_rc0~58
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=1ec634461ea25d87cc16dbeb1318f8e30a07c9f1

Merge branch 'release'
---

1ec634461ea25d87cc16dbeb1318f8e30a07c9f1
diff --cc bindings/python/notmuch/version.py
index bfdcf7ed,49bca347..6101902b
--- a/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'