Merge branch 'MDL-42592_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 14:27:49 +0000 (22:27 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 14:27:49 +0000 (22:27 +0800)

Trivial merge