Merge branch 'MDL-29440-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 13 Mar 2012 22:29:52 +0000 (11:29 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 13 Mar 2012 22:29:52 +0000 (11:29 +1300)

Trivial merge