Merge branch 'MDL-31328_master' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 20:57:06 +0000 (09:57 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 20:57:06 +0000 (09:57 +1300)

Trivial merge