Merge branch 'MDL-29248' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 00:54:46 +0000 (13:54 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 00:54:46 +0000 (13:54 +1300)

Trivial merge