Merge branch 'MDL-50187_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 May 2015 07:48:28 +0000 (09:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 May 2015 07:48:28 +0000 (09:48 +0200)
commita17d9a6b99bbe9556a2e703daa2ef83dc640fee1
treef0257b22dc86b21921ac61cb8055518b01340643
parent88d127d37cf23d8cc40eb4b5cc93ad83bf579e21
parent2261bc153a4f4afcb95d3b4c554f0cb81a984c60
Merge branch 'MDL-50187_master' of git://github.com/dmonllao/moodle