Merge branch 'w18_MDL-45287_m27_dbreset' of git://github.com/skodak/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 28 Apr 2014 12:17:57 +0000 (20:17 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 28 Apr 2014 12:17:57 +0000 (20:17 +0800)

Trivial merge