Merge branch 'MDL-35419' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2012 23:28:34 +0000 (01:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2012 23:28:34 +0000 (01:28 +0200)
commit9577f6ee94dd38ad7b0d0380042ca378754f3dbf
treec02a8b84468741efb467544ed20511fe85364586
parent4f54f20d78cbbb9a3fc1a3c44afcfba6f4a422bf
parent2c76c8942210015ee4b525a489e121ec36ea3c36
Merge branch 'MDL-35419' of git://github.com/timhunt/moodle