Merge branch 'MDL-54657_m32v1' of https://github.com/sbourget/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jul 2016 17:56:20 +0000 (19:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jul 2016 17:56:20 +0000 (19:56 +0200)
commitf9c46195e4864afb6140393ec01a4a6e93f2b9bd
tree09ca9e0d9ae7eb456b5f2a21174137560733940b
parent7647f3887f83daee19be2fea0c3127d89844b5ba
parent25d8a63a4e477cc61520612843a0d1d4e30068f3
Merge branch 'MDL-54657_m32v1' of https://github.com/sbourget/moodle