Merge branch 'MDL-49246-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Mar 2015 13:19:36 +0000 (13:19 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Mar 2015 13:19:36 +0000 (13:19 +0000)

Trivial merge