Merge branch 'MDL-49764_master' of https://github.com/jinhofer/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 May 2015 14:28:48 +0000 (15:28 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 18 May 2015 14:28:48 +0000 (15:28 +0100)

Trivial merge