Merge branch 'wip-MDL-29723_master' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 04:35:04 +0000 (17:35 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 04:35:04 +0000 (17:35 +1300)

Trivial merge