Merge branch 'wip-MDL-37545-m25' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 Jan 2013 18:23:17 +0000 (19:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 Jan 2013 18:23:17 +0000 (19:23 +0100)
commitfab951a6ae11f2a9c229dc28c07cf8503b857bc3
treec6cc86009b68aadd05275eb3128bcec23ec7b537
parent7356e732b7daaaccaf6aed3e0f8abd028e7c0821
parent9890ecfc25a61eb0248e03c836bbc70519237529
Merge branch 'wip-MDL-37545-m25' of git://github.com/samhemelryk/moodle