Merge branch 'wip-MDL-52193-master' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 Dec 2015 15:36:55 +0000 (15:36 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Dec 2015 15:36:55 +0000 (15:36 +0000)
commitbbd3156049bcd471048588e8c68e297699bf6f75
tree9b590e15c4c71128c97ae869ff0429ed7ef34366
parentde6e67940fd9d3e85f07a0feae6ef7e49c253074
parent97562c4d7c8cf14cbaf7096ab173d95b677b9c6c
Merge branch 'wip-MDL-52193-master' of https://github.com/marinaglancy/moodle