Merge branch 'MDL-46451_restoreError' of git://github.com/moodlerooms/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 1 Sep 2014 08:05:51 +0000 (16:05 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 1 Sep 2014 08:05:51 +0000 (16:05 +0800)

Trivial merge