Merge branch 'wip-MDL-52286-master' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 11 Dec 2015 08:57:57 +0000 (08:57 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 11 Dec 2015 08:57:57 +0000 (08:57 +0000)
commitb12b03de850b526c776d4efa60c27b727eddf286
tree7c28080837d73c355feca83cc3b49532c6451457
parent588da1653d836872060bc13e7b902ab4d8f5c0ab
parent73bb7c09905ea2840c1ad8c46feee17245e248b4
Merge branch 'wip-MDL-52286-master' of https://github.com/marinaglancy/moodle