Merge branch 'wip-MDL-41384-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Feb 2014 09:11:42 +0000 (10:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Feb 2014 09:11:42 +0000 (10:11 +0100)
commit845e11407f08461ce3a2a45ca7d092d6a2c83119
tree020475c6f8f39bc72bce0465703593232a7f5195
parente5fd05a36838dba3fa722d442a7abe60b0dbd13c
parent7456c967663aaaea027f308d088e31a220b809e4
Merge branch 'wip-MDL-41384-master' of git://github.com/marinaglancy/moodle