Merge branch 'MDL-57102-master' of git://github.com/jleyva/moodle
commit9cc969057508ac83a16fe8157e737b883dec8199
authorDan Poltawski <dan@moodle.com>
Thu, 24 Nov 2016 10:43:21 +0000 (24 10:43 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 24 Nov 2016 10:43:21 +0000 (24 10:43 +0000)
treecd2904b5007d72263a42556963d48e22ca40d68c
parentb001cd4b17e28c205a0a590b8edd3c673b9e1028
parent851b291998ee1ff0af5734e2e761a92373fabf3e
Merge branch 'MDL-57102-master' of git://github.com/jleyva/moodle