Merge branch 'MDL-50313-master-featureidnumber' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 May 2015 12:54:04 +0000 (13:54 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 25 May 2015 12:54:04 +0000 (13:54 +0100)

Trivial merge