Merge branch 'MDL-40241_master' of https://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Dec 2014 15:46:34 +0000 (15:46 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 11:33:27 +0000 (11:33 +0000)

Trivial merge