Merge branch 'MDL-51075_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 21:44:47 +0000 (22:44 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 21:44:47 +0000 (22:44 +0100)
commit1274fd8316b19aacefac6ba01eb917e535cbaff7
tree61e114aed4484a97d6214d385eedac5c34a394fc
parent9d128ebda1bb0ed93e9b482244870d9398fdc019
parentd1fba0f4f509661c4a461ecff7f0cf5e5c8c23c6
Merge branch 'MDL-51075_master' of git://github.com/dmonllao/moodle