Merge branch 'MDL-46424_master' of https://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Mar 2016 04:38:54 +0000 (12:38 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Mar 2016 04:38:54 +0000 (12:38 +0800)
commitde67ef599f65692caf3688beebaae9ee46e6a2fc
treec45b85e77ecd977db8f44ec416e02c7cbb01436b
parentb23f27fdd20591b919e02a3938d2f64ba646cfd5
parent4ac5ae6248dd58504d6d834616ffa7d1d5830f44
Merge branch 'MDL-46424_master' of https://github.com/dmonllao/moodle