Merge branch 'm25_MDL-43222' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE
commitcc3bfdc006531840e29f8b9f8aeb243e131a39fa
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Jan 2014 21:02:54 +0000 (15 22:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Jan 2014 21:02:54 +0000 (15 22:02 +0100)
tree27383f6fc35d3d8bf21d82a906af7da42b8b45cb
parente1dd20b34ea95a4587d44477e4081e6c4ee0c0d2
parentd677215cf4a36f17f75a6cd50ac83d0783787b70
Merge branch 'm25_MDL-43222' of git://github.com/danmarsden/moodle into MOODLE_25_STABLE