merge more recent content from 3.4.x

svn: r22356
This commit is contained in:
Jérôme Rapinat
2013-05-17 16:03:18 +00:00
parent 6c67f25eb6
commit 1de1e10659
2 changed files with 1778 additions and 1067 deletions
+1160 -757
View File
File diff suppressed because it is too large Load Diff
+618 -310
View File
File diff suppressed because it is too large Load Diff