git.notmuchmail.org Git - notmuch/commit

author	David Bremner <david@tethera.net>
	Thu, 30 Jan 2014 00:20:43 +0000 (20:20 -0400)
committer	David Bremner <david@tethera.net>
	Thu, 30 Jan 2014 00:20:43 +0000 (20:20 -0400)
commit	c792dda683e49e5c3a3050f165fce60be7f3a6d8
tree	8abeb9b64a012c5596c1c7254d00791e8f25ad81	tree \| snapshot
parent	d0ab0ab951bc552f4aa6ca7e68659148b8da1147	commit \| diff
parent	f2e1f0b006d281b9b0a3361dcae37b019eecd502	commit \| diff

Merge tag 'debian/0.17-3' into wheezy-backports

uploaded to Debian unstable

Conflicts:
debian/changelog