Merge branch 'w51_MDL-30605_m23_env23' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Dec 2011 01:37:04 +0000 (02:37 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Dec 2011 01:37:04 +0000 (02:37 +0100)
commit5019c8ebb5f0a6e588068b6640dcb12242d7fc16
tree5601bde40d367de95299e7fa2416fa1e431718b0
parent5c1c0900a5f138202935c45bb0c2729a65b60507
parent01264131718f62ab0013f04f6c4d7d2e17f67e7e
Merge branch 'w51_MDL-30605_m23_env23' of git://github.com/skodak/moodle