Merge branch 'MDL-32917-master-nomerge3' of git://github.com/mouneyrac/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 6 Mar 2014 03:41:09 +0000 (11:41 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 6 Mar 2014 03:41:09 +0000 (11:41 +0800)

Trivial merge