Merge branch 'w42_MDL-29867_m22_author' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2011 21:14:31 +0000 (23:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2011 21:14:31 +0000 (23:14 +0200)
commite4950b6cf087decdac0f9b4684208a7b923c0370
tree2ffd7c7e4c5c02c0e3b91d69ead5c2a7722423dd
parent1272091a6c056d8e4e259dde90dfa7e290a1504b
parent31cd5fe8ef3e919de58eb4725659d48b01efdeb5
Merge branch 'w42_MDL-29867_m22_author' of git://github.com/skodak/moodle