Merge branch 'MDL-27890_master' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 11 Jul 2011 03:25:21 +0000 (11:25 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 11 Jul 2011 03:25:21 +0000 (11:25 +0800)
commit08d29fb18dd1e9a7d25b31fef934926bade55d98
tree345697bb6f3248ef7f9ee4f28a3200bc6934a4ac
parentf7776c0fc865683da4cf76a22aedc47691f55118
parent0f83538e7ed03237fea50eff47b7ec94f0b5c8d6
Merge branch 'MDL-27890_master' of git://github.com/stronk7/moodle