Merge branch 'MDL-38712-master' of git://github.com/danpoltawski/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 2 Apr 2013 08:14:44 +0000 (16:14 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 2 Apr 2013 08:14:44 +0000 (16:14 +0800)

Trivial merge