Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 392bfb4e67e95c15236a76842d4803cfbffa2ebc
https://github.com/phpmyadmin/phpmyadmin/commit/392bfb4e67e95c15236a76842d4803cfbffa2ebc
Author: Michal Čihař <[email protected]>
Date: 2012-03-21 (Wed, 21 Mar 2012)
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_3_4' into QA_3_5
Commit: b81790cc81f7bba9ad0dfdd9bcabdd5b4c3f87c0
https://github.com/phpmyadmin/phpmyadmin/commit/b81790cc81f7bba9ad0dfdd9bcabdd5b4c3f87c0
Author: Michal Čihař <[email protected]>
Date: 2012-03-21 (Wed, 21 Mar 2012)
Changed paths:
M po/ca.po
M po/es.po
M po/sl.po
M po/tr.po
Log Message:
-----------
Merge remote-tracking branch 'weblate/master'
Conflicts:
po/ca.po
po/es.po
po/sl.po
po/tr.po
Commit: a84975c06adaedfb63494e7f8496bd537e30b140
https://github.com/phpmyadmin/phpmyadmin/commit/a84975c06adaedfb63494e7f8496bd537e30b140
Author: Michal Čihař <[email protected]>
Date: 2012-03-21 (Wed, 21 Mar 2012)
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_3_5'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b531455...a84975c
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
