Merge branch 'MDL-47877-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Oct 2014 12:25:27 +0000 (12:25 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Oct 2014 12:25:27 +0000 (12:25 +0000)

Trivial merge