Merge branch 'MDL-47982-master' of git://github.com/gurgus/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 11:03:57 +0000 (11:03 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Nov 2014 11:03:57 +0000 (11:03 +0000)

Trivial merge