Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 32d5a35f4251bc8d522030d2342951ea5f062d63 https://github.com/phpmyadmin/phpmyadmin/commit/32d5a35f4251bc8d522030d23429... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-01-30 (Fri, 30 Jan 2015)

Changed paths: M js/functions.js

Log Message: ----------- Align

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 714ddaca5858e40fbd531dc2eaff8687462aa472 https://github.com/phpmyadmin/phpmyadmin/commit/714ddaca5858e40fbd531dc2eaff... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-01-30 (Fri, 30 Jan 2015)

Changed paths: M po/nb.po M po/pt_BR.po M po/sk.po

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/dc05e240951b...714ddaca5858