Merge branch 'MDL-38475_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 23:04:44 +0000 (01:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 23:04:44 +0000 (01:04 +0200)
commit55a2081d2832193cc9db54a61f83321a402465bf
tree0fb369bb27f15baa1f4ec549c977353ad54723ac
parentc1bccc8ef53839f1611076aee7dcfec58e28399f
parenta394e5784987ea73422aaf182773aaebd6758859
Merge branch 'MDL-38475_master' of git://github.com/dmonllao/moodle