Merge branch 'MDL-35919-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 20:36:01 +0000 (08:36 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 20:36:01 +0000 (08:36 +1200)

Trivial merge