Merge branch 'MDL-31707' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 02:21:29 +0000 (15:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 02:21:29 +0000 (15:21 +1300)

Trivial merge