Merge branch 'MDL-47246_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 8 Dec 2014 13:34:02 +0000 (13:34 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Dec 2014 13:34:02 +0000 (13:34 +0000)

Trivial merge