Merge branch 'MDL-50406_master' of git://github.com/nadavkav/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Jun 2015 10:42:22 +0000 (11:42 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 1 Jun 2015 10:42:22 +0000 (11:42 +0100)

Trivial merge