Merge branch 'MDL-43483_master' of https://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 25 Nov 2014 11:28:19 +0000 (11:28 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Nov 2014 11:28:19 +0000 (11:28 +0000)

Trivial merge