Merge branch 'w05_MDL-26196_20_tags' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Jan 2011 16:17:48 +0000 (17:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Jan 2011 16:17:48 +0000 (17:17 +0100)
commit45289c3e79d545914fd6a3eb02f8d4f2db10e5b4
tree3a75cefb28b9ea71c0b1c7a09bcbdf02855bae32
parentb6a0ec4238b74f1de8ccf6dd6c6754287f2be7a8
parent73de6fa06f6923278950a445bd69b3fbc1e518d2
Merge branch 'w05_MDL-26196_20_tags' of git://github.com/skodak/moodle