Merge remote branch 'phpmyadmin/master'
commit7c25bb1b734f6728bd80c7233e7a759bb4cabc4e
authorAmmar Yasir <ammaryasir.88@gmail.com>
Sat, 20 Aug 2011 04:39:21 +0000 (20 10:09 +0530)
committerAmmar Yasir <ammaryasir.88@gmail.com>
Sat, 20 Aug 2011 04:39:21 +0000 (20 10:09 +0530)
treeed0132e13ef7ed57cb1775514d5c2b5aec5c17fe
parent01d5a76ca992bb521530a804ef358c3ec3e5094c
parent9b2570b0cfa73860fd150d741535991308b5b199
Merge remote branch 'phpmyadmin/master'