Merge branch 'MDL-40062-master' of git://github.com/danpoltawski/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 17 Feb 2014 06:37:18 +0000 (14:37 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 17 Feb 2014 06:37:18 +0000 (14:37 +0800)

Trivial merge