Merge branch 'MDL-56331-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 23:12:00 +0000 (01:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 23:12:00 +0000 (01:12 +0200)
commit049a4f9a2035531ad3404e35273b56d8ff3ce58b
tree2bc925f09529e63e102533518ba9241db40e55d0
parent73c5f7b7a99d4ee010fa6a858dbc51fdb570cdfa
parenta4a815f31c764ce3bc776cc22df2247a41302ade
Merge branch 'MDL-56331-master' of git://github.com/danpoltawski/moodle