Merge branch 'MDL-44468_master' of git://github.com/ds125v/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 07:27:41 +0000 (15:27 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 07:27:41 +0000 (15:27 +0800)

Trivial merge