Merge branch 'MDL-43732' of github.com:merrill-oakland/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 21 Jan 2014 01:28:54 +0000 (09:28 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 21 Jan 2014 01:28:54 +0000 (09:28 +0800)

Trivial merge