Merge branch 'MDL-47850-master' of git://github.com/jleyva/moodle
commitf2bec5d9bad6710fb36277377427e43683ad293c
authorMarina Glancy <marina@moodle.com>
Mon, 27 Oct 2014 03:52:35 +0000 (27 11:52 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 27 Oct 2014 03:52:35 +0000 (27 11:52 +0800)
tree162975c0bbc196956c12b205d59646b8c3ae22c4
parenta8668e161a706be6f687efe4de07edfc6063c4a0
parenta7b572e29d198ce07f4f2380e7e187e3cfec3a20
Merge branch 'MDL-47850-master' of git://github.com/jleyva/moodle