Merge branch 'MDL-47916-master' of git://github.com/jleyva/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 29 Oct 2014 08:15:07 +0000 (16:15 +0800)
committerMarina Glancy <marina@moodle.com>
Wed, 29 Oct 2014 08:15:07 +0000 (16:15 +0800)
commit72dbe74e7e9096353309a5ba38490b27639d6000
tree2da7794e9af91ee5716ebe109872503a59f8b375
parent520bcbb9abc83f97beb1cb14a7b837e368fd8923
parentf47eeafdfde024ef29af0154419ab5daa8737e19
Merge branch 'MDL-47916-master' of git://github.com/jleyva/moodle