Merge branch 'MDL-46282-master-fix' of github.com:andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 2 Oct 2014 08:35:30 +0000 (09:35 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 2 Oct 2014 08:35:30 +0000 (09:35 +0100)
commit2e8101f6e67e15d81b45811f4e8a9398ee9b492f
tree1fc8af26674296dee9647d418c92504d21669a23
parentbe6779d0c4dde7ffbf6caf9429e5f7045ab59580
parent390485058ed674d4003b591677e4411afa40e31d
Merge branch 'MDL-46282-master-fix' of github.com:andrewnicols/moodle