Merge branch 'MDL-46387-master' of https://github.com/dthies/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Aug 2015 11:22:15 +0000 (12:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Aug 2015 16:30:31 +0000 (18:30 +0200)
commitbf4253d772607f93f866d59f5397968286b0cb60
treef26eea77512e3f3468a88cec719477fd9e7010c6
parentb1da1e289b3a727d766559ce2e74cacc284fca74
parent2f62ae82a16eda4c62626a2f61f2ddc890271b8b
Merge branch 'MDL-46387-master' of https://github.com/dthies/moodle