Merge branch 'wip-MDL-43470-master2' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Apr 2016 02:35:50 +0000 (04:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Apr 2016 02:35:50 +0000 (04:35 +0200)
commitcffc01264523d7522a297e3bbbc98d8bc0b79d60
treeeeb235cfa76adeb56953723cf4fa9ff4cf6f680d
parente44b55f5d0c5cb6e39b1f973531dbe27d8050504
parent9b9b9caba380af84dabad587d2223b9846e1e48e
Merge branch 'wip-MDL-43470-master2' of https://github.com/marinaglancy/moodle