Merge branch 'MDL-32289' of git://github.com/lazydaisy/moodle
commit6b8e99dd87d8ab6c37cebb458ad12606e17dd225
authorSam Hemelryk <sam@moodle.com>
Sun, 1 Apr 2012 22:16:52 +0000 (2 10:16 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 1 Apr 2012 22:16:52 +0000 (2 10:16 +1200)
tree53e972271ef9733094f76a4b0bc28ee37bb257aa
parentd0760eac6ccfc1daf96e0ba700b414161fe01d64
parent76002f94f564a53fe9ebe2d68928798337719ee6
Merge branch 'MDL-32289' of git://github.com/lazydaisy/moodle