Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
commitbeda4577c7ccdea73549ce47eca1622b88f99588
authorMadhura Jayaratne <madhura.cj@gmail.com>
Sun, 16 Jun 2013 16:56:13 +0000 (16 22:26 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Sun, 16 Jun 2013 16:56:13 +0000 (16 22:26 +0530)
treeeaafbaa67378a5445039f7ab0e45e4972106a8dc
parent00284d7437c50cbded01a0e61787e122cc5bc8e2
parent0e99869184ae31bec3317c51dc7416558509fcdf
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin