Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: dbef39fc241f02f1f9b2facad421cc008ab689bc https://github.com/phpmyadmin/phpmyadmin/commit/dbef39fc241f02f1f9b2facad421... Author: Marc Delisle marc@infomarc.info Date: 2014-04-29 (Tue, 29 Apr 2014)

Changed paths: M export.php

Log Message: ----------- Remove unneeded end of if/start of if

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: ac4073821e8adaf1eb1ead7741a8d35fa5ab3da7 https://github.com/phpmyadmin/phpmyadmin/commit/ac4073821e8adaf1eb1ead7741a8... Author: Marc Delisle marc@infomarc.info Date: 2014-04-29 (Tue, 29 Apr 2014)

Changed paths: M po/it.po M po/pt.po

Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9c3ff5748996...ac4073821e8a