Merge branch 'm25_MDL-43045' of git://github.com/totara/moodle into MOODLE_25_STABLE
commit9703d42284fb0311283eb3af669afddf22121a3d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Nov 2013 20:30:31 +0000 (26 21:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Nov 2013 20:30:31 +0000 (26 21:30 +0100)
tree837ac9346d6cbfdf75ed4cc39ff5e3c1a43e598c
parent8e999b264357e1d6f61d2a2e582092c0d6049c45
parenteaab90a2df883689c39649bc4f6e6cadacaba4cf
Merge branch 'm25_MDL-43045' of git://github.com/totara/moodle into MOODLE_25_STABLE