Merge branch 'release'

Conflicts:
	NEWS

Conflicts resolved by hand for date of 0.12 release.

10 files changed, 10 insertions, 10 deletions

diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1
index a8c17d81..395cb9c4 100644
--- a/man/man1/notmuch-config.1
+++ b/man/man1/notmuch-config.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-CONFIG 1 2012-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH-CONFIG 1 2012-03-19 "Notmuch 0.12"
 .SH NAME
 notmuch-config \- Access notmuch configuration file.
 .SH SYNOPSIS
diff --git a/man/man1/notmuch-count.1 b/man/man1/notmuch-count.1
index 302a7fa7..35ecc532 100644
--- a/man/man1/notmuch-count.1
+++ b/man/man1/notmuch-count.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-COUNT 1 2012-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH-COUNT 1 2012-03-19 "Notmuch 0.12"
 .SH NAME
 notmuch-count \- Count messages matching the given search terms.
 .SH SYNOPSIS
diff --git a/man/man1/notmuch-dump.1 b/man/man1/notmuch-dump.1
index 7cfe08e1..f479e8bf 100644
--- a/man/man1/notmuch-dump.1
+++ b/man/man1/notmuch-dump.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-DUMP 1 2012-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH-DUMP 1 2012-03-19 "Notmuch 0.12"
 .SH NAME
 notmuch-dump \- Creates a plain-text dump of the tags of each message.
 
diff --git a/man/man1/notmuch-new.1 b/man/man1/notmuch-new.1
index 1158bb28..613658d2 100644
--- a/man/man1/notmuch-new.1
+++ b/man/man1/notmuch-new.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-NEW 1 2012-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH-NEW 1 2012-03-19 "Notmuch 0.12"
 .SH NAME
 notmuch-new \- Incorporate new mail into the notmuch database.
 .SH SYNOPSIS
diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1
index 7ee3cebc..8666549b 100644
--- a/man/man1/notmuch-reply.1
+++ b/man/man1/notmuch-reply.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-REPLY 1 2012-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH-REPLY 1 2012-03-19 "Notmuch 0.12"
 .SH NAME
 notmuch-reply \- Constructs a reply template for a set of messages.
 
diff --git a/man/man1/notmuch-restore.1 b/man/man1/notmuch-restore.1
index 333f4882..db0b697e 100644
--- a/man/man1/notmuch-restore.1
+++ b/man/man1/notmuch-restore.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-RESTORE 1 2012-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH-RESTORE 1 2012-03-19 "Notmuch 0.12"
 .SH NAME
 notmuch-restore \- Restores the tags from the given file (see notmuch dump).
 
diff --git a/man/man1/notmuch-search.1 b/man/man1/notmuch-search.1
index 1b0c415f..06d81a6f 100644
--- a/man/man1/notmuch-search.1
+++ b/man/man1/notmuch-search.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-SEARCH 1 2012-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH-SEARCH 1 2012-03-19 "Notmuch 0.12"
 .SH NAME
 notmuch-search \- Search for messages matching the given search terms.
 .SH SYNOPSIS
diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1
index 1215f919..b81cce69 100644
--- a/man/man1/notmuch-show.1
+++ b/man/man1/notmuch-show.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-SHOW 1 2012-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH-SHOW 1 2012-03-19 "Notmuch 0.12"
 .SH NAME
 notmuch-show \- Show messages matching the given search terms.
 .SH SYNOPSIS
diff --git a/man/man1/notmuch-tag.1 b/man/man1/notmuch-tag.1
index 8a010e4d..aa4546e4 100644
--- a/man/man1/notmuch-tag.1
+++ b/man/man1/notmuch-tag.1
@@ -1,4 +1,4 @@
-.TH NOTMUCH-TAG 1 2012-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH-TAG 1 2012-03-19 "Notmuch 0.12"
 .SH NAME
 notmuch-tag \- Add/remove tags for all messages matching the search terms.
 
diff --git a/man/man1/notmuch.1 b/man/man1/notmuch.1
index 3984314c..2afcc771 100644
--- a/man/man1/notmuch.1
+++ b/man/man1/notmuch.1
@@ -16,7 +16,7 @@
 .\" along with this program.  If not, see http://www.gnu.org/licenses/ .
 .\"
 .\" Author: Carl Worth <cworth@cworth.org>
-.TH NOTMUCH 1 2012-03-18 "Notmuch 0.12~rc2"
+.TH NOTMUCH 1 2012-03-19 "Notmuch 0.12"
 .SH NAME
 notmuch \- thread-based email index, search, and tagging
 .SH SYNOPSIS