Merge branch 'MDL-32917-master-nomerge2' of git://github.com/mouneyrac/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 4 Mar 2014 06:27:33 +0000 (14:27 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 4 Mar 2014 06:27:33 +0000 (14:27 +0800)

Trivial merge