Merge branch 'MDL-44798-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 16 Apr 2014 07:21:08 +0000 (15:21 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 16 Apr 2014 07:21:08 +0000 (15:21 +0800)

Trivial merge