Merge branch 'MDL-38736-master' of git://github.com/danpoltawski/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 27 Mar 2013 04:17:47 +0000 (12:17 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 27 Mar 2013 04:17:47 +0000 (12:17 +0800)

Trivial merge