Merge branch 'MDL-44822' of git://github.com/aolley/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 31 Mar 2014 04:46:21 +0000 (12:46 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 31 Mar 2014 04:46:21 +0000 (12:46 +0800)

Trivial merge