Merge branch 'MDL-54802-30-fix-2' of git://github.com/cameron1729/moodle into MOODLE_...
commit075f978ba23caa8b67165fcd806a78d886bd456a
authorDan Poltawski <dan@moodle.com>
Wed, 5 Oct 2016 13:33:53 +0000 (5 14:33 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Oct 2016 13:33:53 +0000 (5 14:33 +0100)
tree435c2f9ca9111929b5031f7524afb7951fbbaa40
parent41d5e39323f05453b2c5334093c9db046d7de0f4
parent331613ddb178c9e0fc095430dc54e565ffd57da9
Merge branch 'MDL-54802-30-fix-2' of git://github.com/cameron1729/moodle into MOODLE_30_STABLE