Merge branch 'master' of ssh://notmuchmail.org/git/notmuch
authorSebastian Spaeth <Sebastian@SSpaeth.de>
Mon, 5 Sep 2011 13:53:45 +0000 (15:53 +0200)
committerSebastian Spaeth <Sebastian@SSpaeth.de>
Mon, 5 Sep 2011 13:53:45 +0000 (15:53 +0200)

Trivial merge