Merge back into minor

--HG--
branch : minor
This commit is contained in:
Bart van Strien
2012-07-04 14:41:03 +02:00
412 changed files with 93409 additions and 93409 deletions