Merge branch 'MDL-35794' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Jan 2013 21:40:00 +0000 (22:40 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Jan 2013 21:40:00 +0000 (22:40 +0100)
commit17e5c6e8d2abf6da3fbcd7a23f8ae4fe063d2460
treee123cc5567aed4e369a36c21b4abd92af58626e0
parent3cb7609bd61ea8e47447dd5f7fbe7a0f7ece0b68
parentd18f78b04672eb67e5171dd3b4088fa5c047a04c
Merge branch 'MDL-35794' of git://github.com/timhunt/moodle