On Fri, Apr 6, 2012 at 4:39 PM, Marc Delisle <marc@infomarc.info> wrote:

Le 2012-04-05 23:18, Madhura Jayaratne a écrit :

> On Fri, Apr 6, 2012 at 12:52 AM, Dieter Adriaenssens <
> dieter.adriaenssens@gmail.com> wrote:
>
>> Op 5 april 2012 17:24 heeft Marc Delisle <marc@infomarc.info> het
>> volgende geschreven:
>>> Le 2012-04-05 11:17, Michal Čihař a écrit :
>>>> Hi
>>>>
>>>> Dne Thu, 05 Apr 2012 10:58:04 -0400
>>>> Marc Delisle <marc@infomarc.info> napsal(a):
>>>>
>>>>> is this branch still active and needed?
>>>>
>>>> I've asked about this less than year ago ;-)
>>>>
>>>> http://thread.gmane.org/gmane.comp.php.phpmyadmin.devel/9743
>>>
>>> There was a commit on this branch on Feb 16, 2012.
>>
>> Madhura did something with that branch, but I don't kno what.
>> I created it before previous GSoC, as far as I'm concerned it can be
>> removed.
>>
>> I fixed the bug #3076692 [1] with commits e659018eb1ee and 6108cd4d01be.
> And also did some code cleaning up.

Any plans to merge to master?

Well, as mentioned by Dieter, problems when importing back an xml export has to be resolved before merging the changes to master. The bug I fixed was one of them. Bug #3136655 [2] is another. ( This one seems to be fixed with the patches attached to #3135414 [3]. Need to verify though). If these are the only problems I think it's ok to merge the branch to master.