Merge branch 'MDL-45226-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 Apr 2014 02:39:26 +0000 (10:39 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 23 Apr 2014 02:39:26 +0000 (10:39 +0800)

Trivial merge