Merge branch 'MDL-44929-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jun 2014 09:04:11 +0000 (11:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jun 2014 09:04:11 +0000 (11:04 +0200)
commitf393b3ecb1c9d6de50f8614baa7f99193bb82c14
tree57d723c37d832ecfd7656aa132c22b8eb7e10fd6
parent65f4667348ef1115e3b1c1d7a281a77f2049a35a
parent2eb60257a71d5b433711a1d541c3a6a8ea2faef2
Merge branch 'MDL-44929-master' of git://github.com/andrewnicols/moodle