Merge branch 'MDL-45114-master' of git://github.com/jamiepratt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Apr 2014 06:45:10 +0000 (14:45 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Apr 2014 06:45:10 +0000 (14:45 +0800)

Trivial merge