Merge branch 'wip-MDL-19748-master' of https://github.com/marinaglancy/moodle
commit7b82add57906cf9f77a7c51718159c41b727ad20
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Aug 2015 19:20:04 +0000 (3 21:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Aug 2015 19:20:04 +0000 (3 21:20 +0200)
tree9008586ad260cc2175ef5b551e865fe691632191
parent0e1615dfef2f7370a011ce9f524d61f9ce4ce66b
parentdd8a0a3909a13b2a2c67434ea6fb06ca7cb845f1
Merge branch 'wip-MDL-19748-master' of https://github.com/marinaglancy/moodle