Merge branch 'MDL-49842-master' of git://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Apr 2015 09:30:28 +0000 (10:30 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Apr 2015 09:30:28 +0000 (10:30 +0100)

Trivial merge