Merge branch 'master' of https://github.com/mitstek/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Mar 2015 17:27:13 +0000 (17:27 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Mar 2015 17:27:13 +0000 (17:27 +0000)

Trivial merge