Merge branch 'MDL-44620_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jun 2014 16:11:28 +0000 (18:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jun 2014 16:11:28 +0000 (18:11 +0200)
commit71fa28477bfa25bceffa95b8ab2147f90d5d6ec0
tree904353df7fc7187d21d0e1285947fe947c3c1e0c
parent1051166f78507981300623ee69f315f9f3d19112
parentee9f6db7a21662a6ed1fb69210dc0265de5a27c8
Merge branch 'MDL-44620_master' of git://github.com/dmonllao/moodle