Merge branch 'w44_MDL-29897_m22_upgradetxt' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Nov 2011 15:35:57 +0000 (16:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Nov 2011 15:35:57 +0000 (16:35 +0100)
commitff64599f25075f2c389ef8aed7f531819d4d50c1
tree2a1cbaf23adc12ecfa5338adefc6f94f3347ad60
parentb5b99e0b7a74af77ebf043963ee742084720f259
parentee362526f8e60b1be12011962da0359f19267d1b
Merge branch 'w44_MDL-29897_m22_upgradetxt' of git://github.com/skodak/moodle