Merge branch 'release'

diff --combined 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 --combined notmuch-dump.c
index e451ac0c8e89448819184e2480b83db222ac93d6,f0ac193241191da7dbcd64e53f4db71cbf4a2764..5cc3b2f62b46530e5dbb3f63b5d127043fc9c610
--- 1/notmuch-dump.c
--- 2/notmuch-dump.c
+++ b/notmuch-dump.c
@@@ -240,7 -240,7 +240,7 @@@ database_dump_file (notmuch_database_t 
       */
      notmuch_query_set_sort (query, NOTMUCH_SORT_UNSORTED);
  
 -    status = notmuch_query_search_messages_st (query, &messages);
 +    status = notmuch_query_search_messages (query, &messages);
      if (print_status_query ("notmuch dump", query, status))
        return EXIT_FAILURE;
  
@@@ -250,7 -250,8 +250,8 @@@
  
        message = notmuch_messages_get (messages);
  
-       if (dump_tags_message (notmuch, message, output_format, output,
+       if ((include & DUMP_INCLUDE_TAGS) &&
+           dump_tags_message (notmuch, message, output_format, output,
                               &buffer, &buffer_size))
            return EXIT_FAILURE;