Merge branch 'MDL-33080' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 7 Jun 2012 22:23:16 +0000 (10:23 +1200)
committerSam Hemelryk <sam@moodle.com>
Thu, 7 Jun 2012 22:23:16 +0000 (10:23 +1200)
commit76cc4fd17785117036b68bd71ddde164ecb13895
tree7da82b619f1d70f14530c343e032a17dc357b166
parent5874cc6aabcc2a15a9c4e6db0c4c3b8d82f39c9c
parentf61194e3874b0cce1ac5ecb67542fa686195f3da
Merge branch 'MDL-33080' of git://github.com/stronk7/moodle