On Sun, Dec 23, 2012 at 7:21 PM, Pierrick Charron <pierr...@php.net> wrote:
> His commit was I think merged, what you're seeing in this merge is > If it was merged then why is the testfile missing (causing your merge conflict)? -- Ferenc Kovács @Tyr43l - http://tyrael.hu
