Merge branch 'MDL-43408-master' of https://github.com/tonyjbutler/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Jan 2014 02:06:11 +0000 (10:06 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Jan 2014 02:06:11 +0000 (10:06 +0800)

Trivial merge