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

Trivial merge