Merge branch 'MDL-32880_master_3' of git://github.com/pauln/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Dec 2012 21:48:06 +0000 (22:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Dec 2012 21:48:06 +0000 (22:48 +0100)
commit12e13ce047edf13bd470ae6cd0ae5922564b7c2a
treec6bd0701d8bfc34684bd2220bbdee7cad3cb1bb7
parent4ad65dc2b68a9b3342fce5d688f265ca70f30226
parentc931551acb269dd4dc784bbcb95fb09cc83b9503
Merge branch 'MDL-32880_master_3' of git://github.com/pauln/moodle
backup/converter/moodle1/lib.php