Merge branch 'MDL-33845_folder_whitespace' of git://github.com/moodler/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 20 Jun 2012 22:01:49 +0000 (10:01 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 20 Jun 2012 22:01:49 +0000 (10:01 +1200)

Trivial merge