Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 23 Jan 2014 02:27:18 +0000 (10:27 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 23 Jan 2014 02:27:18 +0000 (10:27 +0800)

Trivial merge