aboutsummaryrefslogtreecommitdiff
path: root/COPYING-GPL-3
diff options
context:
space:
mode:
authorDavid Bremner <bremner@debian.org>2012-02-04 12:01:46 -0500
committerDavid Bremner <bremner@debian.org>2012-02-04 12:01:46 -0500
commitd43f6c00b351424e903c2f2b71c34bc5902b467e (patch)
tree17a4f90bd3aa1b5d31e169a790d137831dbf37ce /COPYING-GPL-3
parent8281430558c1b2eafc847620cd84f5ce40bf6741 (diff)
parentf38bc44653ad910abb95add6b09321da11f50581 (diff)
Merge commit '0.11.1'
Conflicts: NEWS bindings/python/notmuch/database.py bindings/python/notmuch/message.py notmuch.1 NEWS merged by hand, others taken from master.
Diffstat (limited to 'COPYING-GPL-3')
0 files changed, 0 insertions, 0 deletions