Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 21 Jan 2014 04:57:05 +0000 (12:57 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 21 Jan 2014 04:57:05 +0000 (12:57 +0800)

Trivial merge