Merge branch 'MDL-47725-master' of git://github.com/FMCorz/moodle
commit1d67a8f209909568b5560548cc42df0f38a7abbe
authorMarina Glancy <marina@moodle.com>
Mon, 20 Oct 2014 07:06:29 +0000 (20 15:06 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 20 Oct 2014 07:06:29 +0000 (20 15:06 +0800)
treece748c9d85a9b9852539cc3e712fcb481fc28dec
parentb3729c99aa54cda61acb0737549e379bb52d6a3a
parent263bf1a10f4393e739452c84ba8ed62d605aa2fc
Merge branch 'MDL-47725-master' of git://github.com/FMCorz/moodle