Merge branch 'MDL-47983_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Nov 2014 15:01:59 +0000 (15:01 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Nov 2014 15:01:59 +0000 (15:01 +0000)

Trivial merge