Merge branch 'MDL-38173-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Mar 2013 17:35:33 +0000 (18:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Mar 2013 17:35:33 +0000 (18:35 +0100)
commitb9f3138dbe8c6d301c9b128c479cca803df6e4aa
tree8b66cb35dfb3bdb2591ad99133a12e0a89041b0a
parent641577eb322416af1eb13b21f713c61ff6605eea
parent005c6640dd356c2476df5592a629bac80c7d9245
Merge branch 'MDL-38173-master' of git://github.com/damyon/moodle