Merge branch 'MDL-42226_master' of https://github.com/markn86/moodle
commit9bb34fb7816bb6e17ede90d8e27580c6d3780e94
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Oct 2013 00:09:11 +0000 (15 02:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Oct 2013 00:09:11 +0000 (15 02:09 +0200)
tree33f58e21884086a29d0a874e264f9c12b62b7fcf
parent3745472f635f92441c3d8d317410b645add2b9ad
parent5241526d204cdd870d48b748c6e25582cdaeb6ff
Merge branch 'MDL-42226_master' of https://github.com/markn86/moodle