Merge branch 'MDL-48285_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Dec 2014 08:47:07 +0000 (08:47 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 12:04:11 +0000 (12:04 +0000)

Trivial merge