Merge branch 'MDL-56765-31' of git://github.com/jleyva/moodle into MOODLE_31_STABLE
commit4e7dde97fca4ae5c649e700f7937ca93b66056c0
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Nov 2016 00:27:49 +0000 (8 01:27 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Nov 2016 00:27:49 +0000 (8 01:27 +0100)
tree4e7f5e0d03a61d12d6aae7291ed6c6f983ea9482
parent49e291c7a6d23e8d9ddecad376a0f02f20c52de8
parent001bd88aeeb5d830ec043d805ca418889c6e1c23
Merge branch 'MDL-56765-31' of git://github.com/jleyva/moodle into MOODLE_31_STABLE