Merge branch 'MDL-49803_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 15 Apr 2015 14:06:17 +0000 (15:06 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 15 Apr 2015 14:06:17 +0000 (15:06 +0100)

Trivial merge