Merge branch 'MDL-48943-master-arialive' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 13 Mar 2015 02:15:29 +0000 (10:15 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 13 Mar 2015 02:15:29 +0000 (10:15 +0800)

Trivial merge