Merge branch 'MDL-40816_m25' of git://github.com/markn86/moodle into MOODLE_25_STABLE
commitd03c0ef72d3e6b9ca40c069600116b1bf0c8a379
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 16:19:32 +0000 (23 18:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 16:19:32 +0000 (23 18:19 +0200)
tree25a148e6acaf7ff383d7a39cd1da5d23c28956b7
parentc8dd490281ae6d8881a1b44f03e7f8d0a1b3be3b
parente94b6c678d187bddfe75ace07b463af1f5ce1f0d
Merge branch 'MDL-40816_m25' of git://github.com/markn86/moodle into MOODLE_25_STABLE