Merge branch 'MDL-39883-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jun 2014 22:46:36 +0000 (00:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jun 2014 22:46:36 +0000 (00:46 +0200)
commitb362c8f90d7c26a28db8a6930b69a1c585cf9730
tree5a0c3feff2d20dac2dd73cf3c6c50fceb72b8946
parentfbdb6497d625eae28e068d1b1bf70d2a8b2f97dc
parentdcbef3f4c2473bda096e5b225e3e03f57b8bd946
Merge branch 'MDL-39883-master' of git://github.com/ankitagarwal/moodle