Merge branch 'MDL-42790_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
commit5d4b5a560a71caacef0fd16c8816214981afb01f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 13 Nov 2013 00:12:45 +0000 (13 01:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 13 Nov 2013 00:12:45 +0000 (13 01:12 +0100)
treeddf73d0c76147d020ea0449d52926466b5ed93b8
parentd385005eaffdf5364654c85f7e409672d1d99036
parent493a747afc51d3d31eaca0e3e3ac78a8218c1a3a
Merge branch 'MDL-42790_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE