Merge branch 'MDL-47814-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 15:13:11 +0000 (16:13 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 15:13:11 +0000 (16:13 +0100)
commit98122f9ad410605ffd85bbb8373aef9b3fe91a6e
tree6c92137856f779c08e4ac9f1e2d8f4e1bcc6dd7e
parentcd9f037e040d93aa4a3bbf415b3ddd7ff4f3948f
parent40a603c79d2ea1ab8ca71c5e49084d4ad0275c2f
Merge branch 'MDL-47814-master' of git://github.com/FMCorz/moodle