Merge branch 'MDL-35029_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 3 Sep 2012 00:16:03 +0000 (12:16 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 3 Sep 2012 00:16:03 +0000 (12:16 +1200)

Trivial merge