[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 481e89: Fix merge conflict

2014-12-22 Thread Madhura Jayaratne
Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 481e89ac941cd5567ad39ee4fcec6ea3eb25e4ae https://github.com/phpmyadmin/phpmyadmin/commit/481e89ac941cd5567ad39ee4fcec6ea3eb25e4ae Author: Madhura Jayaratne madhura...@gmail.com Date: 2014-12-22

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 481e89: Fix merge conflict

2014-12-22 Thread Marc Delisle
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 481e89ac941cd5567ad39ee4fcec6ea3eb25e4ae https://github.com/phpmyadmin/phpmyadmin/commit/481e89ac941cd5567ad39ee4fcec6ea3eb25e4ae Author: Madhura Jayaratne madhura...@gmail.com Date: 2014-12-22