Merge branch 'MDL-47298-master' of git://github.com/FMCorz/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 8 Oct 2014 11:58:43 +0000 (19:58 +0800)
committerMarina Glancy <marina@moodle.com>
Wed, 8 Oct 2014 11:58:43 +0000 (19:58 +0800)
commita3514938465a964133e7de6e0a49212395e0d3c6
treeea24a39f50d120d347cda6eb85b6c90b88c9a80d
parentd7a2a11e672fad5fd9d5f9b73658df42bb7c0bd8
parent776f66d8e01a73ce61238221384b0b7ce2685dd4
Merge branch 'MDL-47298-master' of git://github.com/FMCorz/moodle