Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Dec 2013 03:41:06 +0000 (11:41 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Dec 2013 03:41:06 +0000 (11:41 +0800)

Trivial merge