Merge branch 'MDL-52365_new' of git://github.com/mkassaei/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Dec 2015 13:15:02 +0000 (13:15 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Dec 2015 13:15:02 +0000 (13:15 +0000)
commit29747350b1616360c38783ed88692d3d36abbe81
tree0b5f7a94d5569b6b7ac4990c15293f4bf62f861d
parentc38bdd62c7af318bda85177b04b56c1adfeec60c
parentc398f6ed44e86ec3187a88e106ef4f8a1aad0e20
Merge branch 'MDL-52365_new' of git://github.com/mkassaei/moodle