Merge branch 'MDL-31018-master-1' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 03:11:17 +0000 (11:11 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 03:11:17 +0000 (11:11 +0800)
commit5ba0697050e829f7c52f77574ce1d2ebffc07849
tree16437290e889511ff053e8d3da0cb4e83d315567
parent66fe8d59c87b7812dc7b5a941e89ae878728fd6e
parentfeaae39dfbb791e3e1be9970b62c0eb665445ec1
Merge branch 'MDL-31018-master-1' of git://git.luns.net.uk/moodle