Merge branch 'MDL-30961-master' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 01:59:42 +0000 (14:59 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 01:59:42 +0000 (14:59 +1300)

Trivial merge