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

Trivial merge