Merge branch '44152-27' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2014 23:56:26 +0000 (00:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2014 23:56:26 +0000 (00:56 +0100)
commit5234427f2d993863eb285021568fefa702ee61f1
tree3785e799ce9997c985f228a27885b8eeb6bcff84
parente6b9b5538d0aa2642dccf237e6ea9fb069371f48
parenta6be3193d8f1b26a52a8ed9722f681f66052febc
Merge branch '44152-27' of git://github.com/samhemelryk/moodle