Merge branch 'MDL-44867-m2' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 1 May 2014 02:29:42 +0000 (10:29 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 1 May 2014 02:29:42 +0000 (10:29 +0800)

Trivial merge