Merge branch 'MDL-47761-master' of git://github.com/xow/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Jan 2015 23:26:45 +0000 (00:26 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 15 Jan 2015 08:35:02 +0000 (08:35 +0000)
commit778f0becee07f45f670eb737a34bd668710a29ed
treee79e40f5553208b2938f05f6a17e4c651f941b74
parentccb722b76c6f016935982f696202f631e7c6c5cf
parentcf6d62fc3fe19a1aa3ecc6ca7dbe45085587722a
Merge branch 'MDL-47761-master' of git://github.com/xow/moodle