Merge branch 'MDL-51302-master' of git://github.com/danpoltawski/moodle
commit5e2547612fe5c4a09dac835f5b8b1a062644ac67
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Oct 2015 03:33:23 +0000 (13 11:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Oct 2015 03:33:23 +0000 (13 11:33 +0800)
treeba146e2a687900669422681691462a02e2199a47
parenta6c07028847508bae9634bd406d14bedd475bc43
parentb96da4eaef9efab48a4eea9ece75f026a60821fb
Merge branch 'MDL-51302-master' of git://github.com/danpoltawski/moodle