Merge branch 'MDL-39697' of git://github.com/lazydaisy/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 22 May 2013 01:06:29 +0000 (09:06 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 22 May 2013 01:06:29 +0000 (09:06 +0800)

Trivial merge