Merging from master

This commit is contained in:
lorilee
2010-07-20 15:09:02 -07:00
parent 6ed0cb3726
commit 07d68cb79f
7 changed files with 17 additions and 27 deletions

View File

@@ -2,7 +2,6 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
*
* @version $Id$
* @package phpMyAdmin
*/