Merge branch 'MDL-49034_master' of git://github.com/mattporritt/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 18 Feb 2015 01:36:22 +0000 (09:36 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 18 Feb 2015 01:36:22 +0000 (09:36 +0800)

Trivial merge