7 Apr
2011
7 Apr
'11
11:19 p.m.
On 04/08/2011 12:44 AM, Harald Welte wrote:
Pablo,
you're my hero, thanks for cleaning up the mess I left in the proxy.
I will delay committing your patddches as I know zecke was also working on some ipaccess related bugfix right now and I don't want to cause unneccessary conflicts.
Holger: Can you simply merge pablos patches before/after your fix, whatever you think is appropriate.
I am trying to do the bisect in some minutes but I don't think Pablo's patches will cause any conflict. So feel free to merge them, I will be out of office tomorrow but can do the merge in the evening.