Merge branch 'MDL-26649_master' of https://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 9 Apr 2013 07:13:21 +0000 (15:13 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 9 Apr 2013 07:13:21 +0000 (15:13 +0800)

Trivial merge