Merge branch 'MDL-40123_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE
commit2f956f40b6a79ed57149ab13da1af19c8db52e98
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jul 2013 23:09:20 +0000 (23 01:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jul 2013 23:09:20 +0000 (23 01:09 +0200)
treee8f03ea955e729b865e45f549505bc54e06ebc67
parente024b7130afe7433e7cf26d1749630d493a6bd46
parent2ab6b4d43d3026966a3440aa90c34c0470641a4f
Merge branch 'MDL-40123_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE