Merge branch 'w24_MDL-33636_m23_yuislash' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2012 10:31:27 +0000 (12:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2012 10:31:27 +0000 (12:31 +0200)
commite47275fa0d0d46d19fab3adcbc954a299d9b5d45
tree8ba4e8078b8eb8272750efbb2cb9aa96fa06420d
parent8409bd51f4d8857cdcb29cdb07e5f98c86854eed
parent7953149e01768afbb01a8816fb0e7ead030ff0e1
Merge branch 'w24_MDL-33636_m23_yuislash' of git://github.com/skodak/moodle