Merge branch 'MDL-40165-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_S...
authorMarina Glancy <marina@moodle.com>
Tue, 18 Jun 2013 02:54:40 +0000 (12:54 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 18 Jun 2013 02:54:40 +0000 (12:54 +1000)

Trivial merge