Merge branch '44204-27' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Feb 2014 00:19:43 +0000 (01:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Feb 2014 00:19:43 +0000 (01:19 +0100)
commitbb0949467e38e885a1ac945a5e51368731e37dc5
tree738ca23d57966d7ad3089739759f2229c3250897
parent5f88a2fc11538266f0af4df735bcfe6aacca911f
parent3473a16d7adda63503cc8a08654d2e11bc557f0f
Merge branch '44204-27' of git://github.com/samhemelryk/moodle