Merge branch 'MDL-40918_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jan 2014 06:43:45 +0000 (14:43 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Jan 2014 06:43:45 +0000 (14:43 +0800)

Trivial merge