Merge branch 'wip-MDL-40159-m23' of git://github.com/marinaglancy/moodle into MOODLE_...
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Jun 2013 21:03:54 +0000 (09:03 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Jun 2013 21:03:54 +0000 (09:03 +1200)

Trivial merge