Merge branch 'MDL-52595-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 Dec 2015 11:29:01 +0000 (11:29 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 23 Dec 2015 11:29:01 +0000 (11:29 +0000)
commitc39cc37d5cd42700c87356538ff3f05cc24c5d8f
tree48dc0273b0647a573f86a573442491a0e6a494e7
parent2ece61e65245b81d868de1e7a292b82621f63aa1
parenteb474609aa22085daf46dc16ac8cad51931902be
Merge branch 'MDL-52595-master' of git://github.com/andrewnicols/moodle