Merge branch 'MDL-49354-master' of https://github.com/mtavella-netspot/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 24 Mar 2015 15:14:08 +0000 (15:14 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 24 Mar 2015 15:14:08 +0000 (15:14 +0000)

Trivial merge