Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30
parent 13ec1423f6 049886139c
commit e646a2760c
331 changed files with 127280 additions and 132228 deletions
--- a/changelog.php
+++ b/changelog.php
@@ -3,7 +3,6 @@
 /**
 * Simple script to set correct charset for changelog
 *
- * @version $Id$
 * @package phpMyAdmin
 */