Merge branch 'MDL-38497-admintree-beforesibling' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 16:16:32 +0000 (17:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 16:16:32 +0000 (17:16 +0100)
commit58b9cd031f46b661b113c4ecd01468ed82c8dfb1
treec8a7358a05b57e81cbd35adc442af61a6c5a4cfb
parent83ba845de9f09ffdd8303e16c1661d8b3918d7c8
parent56aee7c2f6f93f3bce0b68b9f459039ba65bca5d
Merge branch 'MDL-38497-admintree-beforesibling' of git://github.com/mudrd8mz/moodle

Conflicts:
lib/upgrade.txt
lib/upgrade.txt