Merge branch 'wip-MDL-51357-master' of git://github.com/marinaglancy/moodle
commit5c6c4a986a09404dd886f531428755a20bb30b8a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Sep 2015 06:00:46 +0000 (9 08:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Sep 2015 06:00:46 +0000 (9 08:00 +0200)
tree35a12512cb260b1b07a48965ab94a798db8de44c
parent731c2712e746053b1ca06b50118632305b447e02
parent2ff1f051831127a4ca4b6a03d509226421179688
Merge branch 'wip-MDL-51357-master' of git://github.com/marinaglancy/moodle