aboutsummaryrefslogtreecommitdiff
path: root/bindings
diff options
context:
space:
mode:
authorDavid Bremner <bremner@debian.org>2011-12-06 19:39:33 -0400
committerDavid Bremner <bremner@debian.org>2011-12-06 19:39:33 -0400
commitf0e0053149bb3b51f4a0cd43371292b639f236a8 (patch)
treef79945f6c0970190ed80b0d31df8b95bacab38b1 /bindings
parentc4d824bc1ee4e49c86315cd3e7f0a4756aff3811 (diff)
parent07bb8b9e895541006eca88430925f1c6524c4708 (diff)
Merge branch 'release'
Conflicts: NEWS Conflicts resolved by inserting the 0.10.2 stanza before 0.11
Diffstat (limited to 'bindings')
-rw-r--r--bindings/python/notmuch/version.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index a6a872e..fd414b0 100644
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,2 +1,2 @@
# this file should be kept in sync with ../../../version
-__VERSION__ = '0.10.1'
+__VERSION__ = '0.10.2'