Merge branch 'MDL-28484-master' of https://github.com/lucisgit/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 8 Oct 2014 01:53:53 +0000 (09:53 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 8 Oct 2014 01:53:53 +0000 (09:53 +0800)

Trivial merge