Merge branch 'MDL-45958-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jun 2014 22:17:27 +0000 (00:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jun 2014 22:17:27 +0000 (00:17 +0200)
commitfbdb6497d625eae28e068d1b1bf70d2a8b2f97dc
treeecd11ae95077e2c64ef95a429b23e5427d0121cc
parent70465e7cb5bb766e18d05413f326f59564dd01ba
parent0a3d81c26139ada51c0b9e0bc4be5b55d6e907a7
Merge branch 'MDL-45958-master' of git://github.com/ankitagarwal/moodle