Merge branch 'wip-MDL-48390-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Dec 2014 17:48:53 +0000 (18:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Dec 2014 17:48:53 +0000 (18:48 +0100)
commitc2f1feffd65c7c21fc55c55a072481b368ea08bb
treea4aff7c273d2431da9df86f26eea8e69554f91e5
parent065fa16e75edf1eb463c668ccfe3428cfe3833be
parent3e70f5792bfb8946a0ca9fba256e18b37e3b6feb
Merge branch 'wip-MDL-48390-master' of git://github.com/marinaglancy/moodle