Merge branch 'MDL-30392' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 21 Nov 2011 23:59:19 +0000 (12:59 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 21 Nov 2011 23:59:19 +0000 (12:59 +1300)
commitf5d0ac107758502255f165fd18f285c36cad48e4
tree95ac76cbbe1fbc7e8c24a3b510971695ea645d40
parent009b14c065dc3f6ac32c4a5164af4fa37f664ec2
parent08fa81d6c554c28fe77162ce182f053eeed31a0f
Merge branch 'MDL-30392' of git://github.com/stronk7/moodle