Merge branch 'MDL-33441' of git://github.com/danpoltawski/moodle
commit4ed1657f3e983574bc61443b40d8bdfa1c4cc5ab
authorSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 22:10:05 +0000 (6 10:10 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 22:10:05 +0000 (6 10:10 +1200)
treecec3b20ecbc4dbcf95be5dbe562d5d995287a2a0
parentf48de74428dea179464879b47e7c3dece0b065bc
parent7f88c426082d22a90e450c5d9b3d2d5b5a5f2e34
Merge branch 'MDL-33441' of git://github.com/danpoltawski/moodle