Merge branch 'MDL-31711' of git://github.com/nebgor/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 1 Apr 2012 22:22:22 +0000 (10:22 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 1 Apr 2012 22:22:22 +0000 (10:22 +1200)
commit3279dd42535bfb6d36eb601fc2bef9a91f5931c5
tree82ae29d369a632706ca79482f4cba2d02c9275d9
parent6b8e99dd87d8ab6c37cebb458ad12606e17dd225
parent1469dee12fb9713a5fcef80ae58d8f9de6ed0767
Merge branch 'MDL-31711' of git://github.com/nebgor/moodle