Merge branch 'MDL-21933_master' of https://github.com/mr-russ/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Jun 2013 03:45:56 +0000 (15:45 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Jun 2013 03:45:56 +0000 (15:45 +1200)

Trivial merge