[Phpmyadmin-devel] QA_3_5 merge

[Michal Čihař]

Hi

please try to merge every change done in QA_3_5 into master so that
future changes can be merged easier. Today I was unable to do merge
because these commits (second one is just a fix for first one) do not
apply at all.

In case the changes should not be merge at all, just do:

git checkout master
git merge -s ours origin/QA_3_5

This will tell git that it should not care about extra commits in
QA_3_5 anymore.

So master is now missing following commits and I have no clue if there
is something needed there or not:

commit a483935cf8aac81a2d87390af36f387100f3bdf2
Author: J.M <me at mynetx.net>
Date:   Wed Aug 22 11:14:45 2012 +0200

    bug #3559925 [privileges] Incorrect updating of the list of users

commit e0383e6b1938dd5a5fd377e27d04c3880b6c2d6d
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Aug 22 06:35:26 2012 -0400

    Remove extraneous characters



-- 
	Michal Čihař | http://cihar.com | http://blog.cihar.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.phpmyadmin.net/pipermail/developers/attachments/20120822/5e318d15/attachment.sig>