Merge branch 'wip-MDL-50678-master' of git://github.com/marinaglancy/moodle
commit641e3c434602fd8b9abeaac63234eb5e48dedff7
authorDan Poltawski <dan@moodle.com>
Mon, 20 Jul 2015 12:53:47 +0000 (20 13:53 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Jul 2015 12:53:47 +0000 (20 13:53 +0100)
tree9aa99f01bc7c50d87032c31c43fdb672b631fcce
parent0c59bb747ddab3dad2ed29a7a8c8dd79649e8da8
parentf1aeb61893f83f17fc1c5903e6106e0d0e085c9c
Merge branch 'wip-MDL-50678-master' of git://github.com/marinaglancy/moodle