Merge branch 'MDL-36978' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 01:21:37 +0000 (14:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 01:21:37 +0000 (14:21 +1300)

Trivial merge