Merge branch 'MDL-25657' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 4 Jan 2011 05:30:32 +0000 (13:30 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 4 Jan 2011 05:30:32 +0000 (13:30 +0800)
commit724125bdd437fc0166e131372bc1b738e06f0502
tree499dfeb2c87c7d6179aa10ac23a4fec265fdc6c2
parentb095f1694790b3f8079454878f8e28c0614ec031
parent03a50532becc15be71641e8a5c40ff28e406ecea
Merge branch 'MDL-25657' of git://git.luns.net.uk/moodle