Merge branch 'MDL-40285_m27' of git://github.com/markn86/moodle into MOODLE_27_STABLE
commit86799aa49f53b020f1855da79fa144d94ed933bc
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jan 2015 11:21:23 +0000 (27 12:21 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jan 2015 11:21:23 +0000 (27 12:21 +0100)
tree77d7e4731a3a9a8f88cad1226c36fb08006bdd1f
parent358c48ff276798b55aa2a43e56e52ca04d98d72b
parent5869dbfc4cc308e56c6dc72125fe77b4f833ecae
Merge branch 'MDL-40285_m27' of git://github.com/markn86/moodle into MOODLE_27_STABLE