Merge branch 'MDL-29904-master' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 23 Nov 2011 00:54:26 +0000 (13:54 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 23 Nov 2011 00:54:26 +0000 (13:54 +1300)

Trivial merge