Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f3c28953d136a5ca76eeef85f638dee77c27341f https://github.com/phpmyadmin/phpmyadmin/commit/f3c28953d136a5ca76eeef85f638... Author: Marc Delisle marc@infomarc.info Date: 2013-10-01 (Tue, 01 Oct 2013)

Changed paths: M scripts/create-release.sh

Log Message: ----------- Fix merge conflict