[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 4ff912: Merge remote-tracking branch 'origin/QA_3_5' into ...

[Rouslan Placella]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 4ff912347edce9cd242b90ffb506a4f590faa291
      https://github.com/phpmyadmin/phpmyadmin/commit/4ff912347edce9cd242b90ffb506a4f590faa291
  Author: Rouslan Placella <rouslan at placella.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M ChangeLog
  M examples/openid.php
  M index.php
  M js/gis_data_editor.js
  A js/jquery/jquery.event.drag-2.0.js
  R js/jquery/jquery.event.drag-2.0.min.js
  M js/tbl_gis_visualization.js
  M po/pt_BR.po
  M po/tr.po
  M tbl_gis_visualization.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5

Conflicts:
	po/fr.po
	po/pt_BR.po


  Commit: 779c6361832f5fa1e6a9d2a7d339581987844620
      https://github.com/phpmyadmin/phpmyadmin/commit/779c6361832f5fa1e6a9d2a7d339581987844620
  Author: Rouslan Placella <rouslan at placella.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Log Message:
  -----------
  Merge branch 'QA_3_5'

Conflicts:
	po/fr.po
	po/pt_BR.po


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/350c86b...779c636