Merge branch 'wip-MDL-50678-m28' of git://github.com/marinaglancy/moodle into MOODLE_...
commit4fb12f39bed0fdababb58e6cd57058654eee3d31
authorDan Poltawski <dan@moodle.com>
Mon, 20 Jul 2015 12:54:05 +0000 (20 13:54 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Jul 2015 12:54:05 +0000 (20 13:54 +0100)
tree6599e50fc360038ed85eded6d2aaf18903a8475a
parenta02fc8bb051d9f66a3966c478117e5fe48e098a1
parent94081247f840cfe2d7ad4b90a6b9377b3cb1abc3
Merge branch 'wip-MDL-50678-m28' of git://github.com/marinaglancy/moodle into MOODLE_28_STABLE