Merge branch 'MDL-42166-master' of git://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Dec 2014 15:38:49 +0000 (15:38 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Dec 2014 15:38:49 +0000 (15:38 +0000)

Trivial merge