Merge branch 'MDL-48307-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE
commit546aae396b72dc6219b46744694679d53317381e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2016 23:14:17 +0000 (22 00:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2016 23:14:17 +0000 (22 00:14 +0100)
tree5ad3b43b752239ba23a61d98cfe5e9e74b8046cb
parent20d094cb7c1d51ec76c4f1225d3ace3a26b647d8
parenta2c926a1842f2ffcbf8b19a6740624e1a618e784
Merge branch 'MDL-48307-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE