Merge branch 'MDL-52981-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 21:55:07 +0000 (22:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 21:55:07 +0000 (22:55 +0100)
commit40e85f3cd86377ff3de14e6bffca8101b587c94b
treeb9baee18930a7e5c392ee98fa9a86bdfb32fb56a
parent1274fd8316b19aacefac6ba01eb917e535cbaff7
parent6bd871d3ddb4c0832ab25da3d34e813d7ab9c8c9
Merge branch 'MDL-52981-master' of https://github.com/sammarshallou/moodle