git.marmaro.de Git - mmh/commit

]> git.marmaro.de Git - mmh/commit

author	markus schnalke <meillo@marmaro.de>
	Sat, 14 Feb 2015 16:44:14 +0000 (17:44 +0100)
committer	markus schnalke <meillo@marmaro.de>
	Sat, 14 Feb 2015 16:44:14 +0000 (17:44 +0100)
commit	5a12e4b0477d3ad699f5713682d26079f2792d17
tree	0226192dbea0fe6605200ae9675ec6a5f5342f18	tree \| snapshot
parent	f9ed40f2742263b3a1023bedee4139b4b18f0a86	commit \| diff
parent	a26d3f6e071fa5704406317fe50a1805659ed2f8	commit \| diff

Merge branch 'master' of ssh://marmaro.de:443/var/git/mmh

Conflicts:
uip/mhl.c
uip/mhlist.c
uip/mhmail.c
uip/pick.c
uip/send.c

meillo's mail handler