Merge branch 'MDL-49371_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 17 Mar 2015 09:06:59 +0000 (09:06 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 17 Mar 2015 09:06:59 +0000 (09:06 +0000)

Trivial merge