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)
1  2 
backup/converter/moodle1/lib.php

Simple merge