Merge branch 'MDL-34627_master' of https://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Dec 2014 07:50:00 +0000 (07:50 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 12:04:10 +0000 (12:04 +0000)

Trivial merge