Merge branch 'master' of git://repo.or.cz/phpmyadminorigin/master
commite5e31552408525bf3b830a513e60779197c60ad8
authorAlex Marin <alex.ukf@gmail.com>
Sat, 21 Jan 2012 12:30:47 +0000 (21 14:30 +0200)
committerAlex Marin <alex.ukf@gmail.com>
Sat, 21 Jan 2012 12:30:47 +0000 (21 14:30 +0200)
tree0684857e7291e0196c8c49ff76903c6089bc5906
parent8db3d2f249f671464582c24a8b7992a3d3abf1ad
parentac95cf21a82c7617338e1abb7c07821a62bd3f98
Merge branch 'master' of git://repo.or.cz/phpmyadmin