Merge branch 'MDL-51861' of https://github.com/stronk7/moodle
commit5208168e0c5fcc2341d932fd62225611e02e1f43
authorDan Poltawski <dan@moodle.com>
Fri, 6 Nov 2015 10:04:02 +0000 (6 10:04 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 6 Nov 2015 10:04:02 +0000 (6 10:04 +0000)
tree069393015d06e2752e21eac30f5337bf25155399
parent265ddbf30c2a8df2e9becaaa38c2e4b262eb886f
parented4e707577877f9253e376d22ce307140fcb8c2c
Merge branch 'MDL-51861' of https://github.com/stronk7/moodle