Merge branch 'MDL-47480-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Jun 2015 22:32:10 +0000 (00:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Jun 2015 22:32:10 +0000 (00:32 +0200)
commit28ddf1e94d030afaaf98e0f75cd6c34030d135e2
tree53f0e787035d98440bbf9d3c223b11594680ab99
parent75704fe6b82c71054e0203ea06fd0b451b2f8f25
parentc44b4213e6310d3f6f33b4776f3d4cb4f15d6fae
Merge branch 'MDL-47480-master' of git://github.com/ankitagarwal/moodle