Merge branch 'MDL-47835_master' of git://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 29 Oct 2014 03:19:46 +0000 (11:19 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 29 Oct 2014 03:19:46 +0000 (11:19 +0800)

Trivial merge