Merge branch 'wip-MDL-39177-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 May 2013 00:22:55 +0000 (02:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 May 2013 00:22:55 +0000 (02:22 +0200)
commit65fc4c39a931e3c2f81f6f441c6871afadc8ba7c
treecaf9f5b6d98f7d185633f47429a82243733642fd
parentec969f891f0c8fa55c07aa5cdfbd20d37510e696
parent6dd92c0234eeb2e5340d0f9555406c95f122e77b
Merge branch 'wip-MDL-39177-master' of git://github.com/marinaglancy/moodle