Merge branch 'MDL-38807-master' of git://github.com/danpoltawski/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 29 Apr 2013 06:17:53 +0000 (14:17 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 29 Apr 2013 06:17:53 +0000 (14:17 +0800)

Trivial merge