Merge branch 'MDL-24408_2' of https://github.com/oasychev/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 01:14:06 +0000 (03:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 01:14:06 +0000 (03:14 +0200)
commitbfa5acac647aca54bcba3b510a549124589668d9
tree207fdefb50f8da13fd7b8d0cda4fd6eae4519443
parent6faa51785601fa6f16b8955cb1d276948f5f3eb6
parent92e83e2d0e96901b0ad7a383a48bafcb31b9de15
Merge branch 'MDL-24408_2' of https://github.com/oasychev/moodle