Merge branch 'MDL-41914-weekly' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Oct 2013 14:06:32 +0000 (16:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Oct 2013 14:06:32 +0000 (16:06 +0200)
commite68ff1ec32943e0419077bd4731d8cdeae027c38
treed336736286fcf0f50546b49c604cd33a346c6794
parent033f721362d2392383b2c0aa13f72d728415cb92
parent6a403810b957dcec207beec5f87319ab65a770ea
Merge branch 'MDL-41914-weekly' of git://github.com/jleyva/moodle