Merge branch 'MDL-40207-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
authorMarina Glancy <marina@moodle.com>
Tue, 18 Jun 2013 05:41:36 +0000 (15:41 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 18 Jun 2013 05:41:36 +0000 (15:41 +1000)

Trivial merge