Merge branch 'MDL-47400-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Oct 2014 17:12:38 +0000 (18:12 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Oct 2014 17:12:38 +0000 (18:12 +0100)
commit83b49754d32dc4720730c2609ce873186dab4aa3
tree79f1ec13165bf387e87b6d09ce1eefceb3bbf539
parentcf3fbf8a0eb14e3c647a7a03e1d4e8745d9b1940
parenta07ec4565f36cfd5dc6838b5809c26e01d1918f8
Merge branch 'MDL-47400-master' of git://github.com/andrewnicols/moodle