Merge branch 'wip-MDL-33416-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 30 Sep 2013 02:42:03 +0000 (15:42 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 Sep 2013 02:42:03 +0000 (15:42 +1300)

Trivial merge