Merge branch 'MDL-38079_master' of git://github.com/mr-russ/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 18 Jun 2013 01:18:30 +0000 (11:18 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 18 Jun 2013 01:18:30 +0000 (11:18 +1000)

Trivial merge