Merge branch 'MDL-46867' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Aug 2014 23:37:34 +0000 (01:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Aug 2014 23:37:34 +0000 (01:37 +0200)
commitd3ebc21fdf4ee6b3521e69b130aa4b5c940ebd47
treea8a53bb31d9b8a3fe1a92ad05913e3c83546dd00
parent40f1dff05f3065b6533886eb1286178e1a517c3a
parent062d04cffc5a605c9eeb6fa7b4ceee819b9a4918
Merge branch 'MDL-46867' of git://github.com/timhunt/moodle