Merge branch 'MDL-39015-master' of git://github.com/danpoltawski/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 8 Apr 2013 04:32:56 +0000 (12:32 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 8 Apr 2013 04:32:56 +0000 (12:32 +0800)

Trivial merge