Merge branch 'MDL-36570' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 21:09:19 +0000 (23:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 21:09:19 +0000 (23:09 +0200)
commit1ca5ce1b33f0cc822aa38ebd9867cf08367827c7
treeecf27574b420714ae1a9dec6eab1b9dea8aa3f7b
parent896efbeadb33b37dd0d971eb0b82a437eac86b1b
parentc7218aef8d4b366beb751574eef86a47ac859991
Merge branch 'MDL-36570' of git://github.com/timhunt/moodle