Merge branch 'MDL-57411-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Apr 2017 11:44:03 +0000 (12:44 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Apr 2017 11:44:03 +0000 (12:44 +0100)
commit5f5f71ea6214b059325eebf3ae0630baa369b454
tree7331cf547718483464b779595bd0dd9bf036ab87
parentc3345f32f0821c53cd01b57a8a13e1afc7e69acc
parent8c60d198c287b6443de68954ac12b993bc67d83a
Merge branch 'MDL-57411-master' of git://github.com/jleyva/moodle