[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 3e363c: These are resources

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3e363c45b93135727b6e2ebcfd4d622f27a2ae99 https://github.com/phpmyadmin/phpmyadmin/commit/3e363c45b93135727b6e2ebcfd4… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-04-15 (Wed, 15 Apr 2015) Changed paths: M libraries/dbi/DBIMysql.class.php Log Message: ----------- These are resources Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: 266588e74f879793104c118abd9e145600d6f77b https://github.com/phpmyadmin/phpmyadmin/commit/266588e74f879793104c118abd9… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2015-04-15 (Wed, 15 Apr 2015) Changed paths: M ChangeLog M libraries/tbl_relation.lib.php M po/it.po M po/vi.po M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9700f11030cd...266588e74f87