Merge branch 'MDL-43882_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 25 Feb 2014 07:33:58 +0000 (15:33 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Feb 2014 07:33:58 +0000 (15:33 +0800)

Trivial merge