Merge branch 'MDL-31515-master-1' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 13 Feb 2012 21:56:27 +0000 (10:56 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 13 Feb 2012 21:56:27 +0000 (10:56 +1300)
commitcaec8e44c089287f59d04a254ef619bb831352fb
treed3840e6103bbac16389a9f84e92b20b5499b9f6f
parent66f5d0ea135c972adaab19e53bc691b183ee078e
parentf0f41c5e575bf4b6bd38e418cbbdaf5f767d8542
Merge branch 'MDL-31515-master-1' of git://git.luns.net.uk/moodle