Merge remote branch 'dme/dme-for-cworth'
authorCarl Worth <cworth@cworth.org>
Fri, 2 Apr 2010 22:40:13 +0000 (15:40 -0700)
committerCarl Worth <cworth@cworth.org>
Fri, 2 Apr 2010 22:47:27 +0000 (15:47 -0700)
commit44df403ccd2fa637dfa543f749a949454245b182
tree7083af772edb3533713d0d2591644fd6520bfcdb
parenta07962d3ec898f58507f71ada7af66f1c305cf60
parent2e9c7aba99598eafd7b5fc52897da14ea13af216
Merge remote branch 'dme/dme-for-cworth'

Conflicts:
notmuch.c (Simply the change in documentation indentation level).
notmuch-client.h
notmuch.c