Merge branch 'MDL-38243-master' of git://github.com/lucisgit/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 4 Mar 2013 03:25:50 +0000 (16:25 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 4 Mar 2013 03:25:50 +0000 (16:25 +1300)

Trivial merge