Merge branch '44547-27' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Mar 2014 23:28:34 +0000 (00:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Mar 2014 23:28:34 +0000 (00:28 +0100)
commit6d9ba13dc8d042d20169ecfd77aa46e2cd8533ad
tree9a0f00bda901f5d103166e7a7d05f13157b683aa
parente89fba41afdf84010a2d9ab249ae792273444885
parent8373c7e38e70afcb65550625c5938d9ec753f706
Merge branch '44547-27' of git://github.com/samhemelryk/moodle