Merge remote branch 'origin/master'

2010-05-01 22:40:31 +02:00
parent d29897ef9d 435a470445
commit 3fe1c4ebc2
1 changed files with 2 additions and 0 deletions
--- a/2
+++ b/2
@@ -82,6 +82,8 @@ $Id$
 + [doc] Incorporate synchronisation docs into main document.
 + [core] Include Content Security Policy HTTP headers.

+3.3.4.0 (not yet released)
+
 3.3.3.0 (not yet released)
 - patch #2982480 [navi] Do not group if there would be one table in group,
  thanks to Lorikeet Lee.