Merge branch 'MDL-40922_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Jan 2014 07:11:23 +0000 (15:11 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Jan 2014 07:11:23 +0000 (15:11 +0800)

Trivial merge