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

Trivial merge