Merge branch 'MDL-40592_master' of https://github.com/nadavkav/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 May 2015 11:28:38 +0000 (12:28 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 25 May 2015 11:28:38 +0000 (12:28 +0100)

Trivial merge