Merge remote-tracking branch 'origin/3.4' into 3.5

This commit is contained in:
Laurent Destailleur 2014-08-06 10:16:25 +02:00
commit 8c25fdfd2c
4 changed files with 4 additions and 4 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long