The branch, master has been updated via da57d39e8762b3c999ca54194c02f6414de0760b (commit) via 86cdc9f7bb1334f47546159c2d83960ff36426a6 (commit) via bec6e74bd32f848a922f88969b83a547fc9ab1bd (commit) via 3e31ab117262a1d36c5dd0d57d9ec823289d20f9 (commit) via 0527c3ea78d869596ab90903850cbff8fbcc67fc (commit) via a80d0892f8c584aaf8e4cf3f505b178cfd82be51 (commit) from 8e80009897929be9f355512f4bda64b7e8f080a1 (commit)

- Log ----------------------------------------------------------------- commit da57d39e8762b3c999ca54194c02f6414de0760b Merge: 8e80009897929be9f355512f4bda64b7e8f080a1 86cdc9f7bb1334f47546159c2d83960ff36426a6 Author: Michal Čihař mcihar@novell.com Date: Mon Mar 21 11:40:01 2011 +0100

Merge branch 'QA_3_3'

Conflicts: Documentation.html README libraries/Config.class.php translators.html

-----------------------------------------------------------------------

Summary of changes: ChangeLog | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog index d9897e8..5b76567 100644 --- a/ChangeLog +++ b/ChangeLog @@ -151,7 +151,9 @@ - bug #3208723 [import] Fix import of utf-8 XML files. - bug #3039384 [auth] Force signon auth on signon URL change.

-3.3.10.0 (not yet released) +3.3.11.0 (not yet released) + +3.3.10.0 (2011-03-19) - patch #3147400 [structure] Aria table size printed as unknown, thanks to erickoh75 - erickoh75 - patch #3150164 [structure] Ordering by size gives incorrect results,

hooks/post-receive