Merge branch 'MDL-52185-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Nov 2015 18:26:57 +0000 (19:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Nov 2015 18:26:57 +0000 (19:26 +0100)
commit11780411c64df83d558c01acff754c076725c553
treebe58fe7678cc1198d82980f79b2b988bd531af34
parent14248189b74d030a7f64595bb33791b08d5f3186
parent8c9dbacd7964ade6304cd48e2578e9c7289fde54
Merge branch 'MDL-52185-master' of git://github.com/danpoltawski/moodle