Merge branch 'wip-MDL-35482-master' of git://github.com/satrun77/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Mar 2015 23:39:12 +0000 (00:39 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Mar 2015 23:39:12 +0000 (00:39 +0100)
commite448df5ec99fcc665aca52207d2cde09c478c4dd
tree0c04f7bb9bd0abe0e03790e82e49d4c520e1dcc4
parent0b8cb023c1352864a13ce4d57363bcf3334d684e
parent324954141e8ed88fb556c56cf191acf36ac616b1
Merge branch 'wip-MDL-35482-master' of git://github.com/satrun77/moodle