Merge branch 'MDL-33984' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jun 2012 10:46:59 +0000 (18:46 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Jun 2012 10:46:59 +0000 (18:46 +0800)
commita9ca93db95e2a1f55bffff09df03f76e8fc2ccf5
treed1b30eb8f4f3576823e6b2be4ddd7577b07ab085
parentf5fee1e148a2f436dabf1518cc4d66e87836fc47
parent95bcc6e2d3adc633036553ca261ecc5350604423
Merge branch 'MDL-33984' of git://github.com/stronk7/moodle