Merge remote branch 'origin/master'

2010-07-18 20:40:15 +02:00
parent d447fe654b 0c9cbf6c6e
commit e0d1e92336
1 changed files with 2 additions and 0 deletions
--- a/2
+++ b/2
@@ -86,6 +86,8 @@ $Id$
 - patch #3025161 [core] Prevent sending of unnecessary cookies, 
  thanks to Piotr Przybylski  - crackpl

+3.3.6.0 (not yet released)
+
 3.3.5.0 (not yet released)
 - patch #2932113 [information_schema] Slow export when having lots of
  databases, thanks to Stéphane Pontier - shadow_walker