Merge branch 'MDL-43809_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
commite373f3bd042d04f2ac61fb823a2270fa192fe75d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jan 2014 10:00:47 +0000 (27 11:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jan 2014 10:00:47 +0000 (27 11:00 +0100)
tree97e02ebae2dade3ecd20c2845ff88d0c7fa7beab
parentdbabf975c560597fddadd86e6c8ff853be446d20
parenta541c63bb040e9664e00f82bf8184985a72063cd
Merge branch 'MDL-43809_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE