Merge branch 'w12_MDL-38558_m25_preupgrade' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 18:15:09 +0000 (19:15 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 18:15:09 +0000 (19:15 +0100)
commite0e59a0c380ca41fa264760a88a12048db65e307
tree2b1c910fe7b7fc273c967fb8f45f37a220462598
parent49ac0c5d6a503fd7c6c1f916517c038f0bf29e08
parent6b4b74904b7a10d97a56bc53a955c7c715e76d24
Merge branch 'w12_MDL-38558_m25_preupgrade' of git://github.com/skodak/moodle