Merge branch 'MDL-51458-master' of git://github.com/andrewnicols/moodle
commitc7ec75d670f97f3e284b60914a594345a5fbf78e
authorDan Poltawski <dan@moodle.com>
Thu, 22 Oct 2015 11:13:39 +0000 (22 12:13 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 22 Oct 2015 11:13:39 +0000 (22 12:13 +0100)
tree2614f5a0ae9abef98181bbbfb3a30cb5794b2966
parent3ba7bf006ea980f6e8d5e445d34d279f921a9ec5
parentab17b4f7eed9e1938d7736e118ff917b979f60d7
Merge branch 'MDL-51458-master' of git://github.com/andrewnicols/moodle