merging hassle. most is caused by func() -> func(void) converions. else than that, you don't want me to put the ChangeLog entries in here ;)
merging hassle. most is caused by func() -> func(void) converions. else than that, you don't want me to put the ChangeLog entries in here ;)