Merge branch 'MDL-44990-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 02:26:38 +0000 (10:26 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 02:26:38 +0000 (10:26 +0800)

Trivial merge