Merge branch 'MDL-45257-master-2nd' of git://github.com/FMCorz/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 30 Apr 2014 02:05:11 +0000 (10:05 +0800)
committerMarina Glancy <marina@moodle.com>
Wed, 30 Apr 2014 02:05:11 +0000 (10:05 +0800)

Trivial merge