[Phpmyadmin-devel] Double-checking a commit

[Isaac Bennetch]

Hi, I just merged the pull request for AES_ENCRYPT [1], which required a
little bit of manual work to complete the merge. I thought everything went
well, except the commit history [2] looks strange to me. Would someone mind
double-checking that I didn't inadvertently do something wrong? I pretty
much followed the GitHub instructions, but this is the first time I've done
a merge where I committed back to the project repository rather than my
private one, so I'm a bit extra cautious.

Thanks

1 - https://github.com/phpmyadmin/phpmyadmin/pull/290
2 -
https://github.com/phpmyadmin/phpmyadmin/commit/8fbad56812f0b5b0730b07961c7db329bdef9dae
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.phpmyadmin.net/pipermail/developers/attachments/20130516/49cf7820/attachment.html>