Merge branch 'MDL-49187' of https://github.com/spvickers/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 Mar 2015 14:45:53 +0000 (14:45 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Mar 2015 14:45:53 +0000 (14:45 +0000)

Trivial merge