Merge branch 'MDL-47869-master' of git://github.com/lameze/moodle
authorMarina Glancy <marina@moodle.com>
Fri, 7 Nov 2014 07:03:32 +0000 (15:03 +0800)
committerMarina Glancy <marina@moodle.com>
Fri, 7 Nov 2014 07:03:32 +0000 (15:03 +0800)
commit293f1b4d85d5a9b4b22b8e37eb2283f9a0b04157
treeeb5c9ab7ae7c39113db5a39f563b8ce3ccd59daf
parent2f1d0ea6639d8b66fcc4bebb2c712671fe3f2330
parent7c2a2e1a939f21881916d86f3ad620a45f902c36
Merge branch 'MDL-47869-master' of git://github.com/lameze/moodle