Merge branch 'wip-MDL-43398-m26' of git://github.com/marinaglancy/moodle into MOODLE_...
commitee21ac533370942d6bc0268ed61e3ad1cf1fd651
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 00:50:34 +0000 (2 02:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 00:50:34 +0000 (2 02:50 +0200)
tree6ba133427af4d2fb4857d1fb94929766f590ff1b
parent001247f3c9f700287d997f653c63e31766b8c9ba
parentd654a1e6d296216640e57e21f4186723a439fe49
Merge branch 'wip-MDL-43398-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE