Merge branch 'MDL-42410-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Oct 2013 21:35:24 +0000 (23:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Oct 2013 21:35:24 +0000 (23:35 +0200)
commit20ddc0c9cfbfcde9d807a50f33d5d696d8b61b39
treec5492284cbe714e51277698cbfbb38bc4da05f34
parentc783a415dca14721658110ea1a1104d0a1c20c18
parent05f597ecacc7ba8b89c8cbe8962cd8981783d5a2
Merge branch 'MDL-42410-master' of git://github.com/danpoltawski/moodle