Merge branch 'MDL-40255_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE
commit94a541f7ff8fcc38548a9d2b3c54e24745f4362b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Jun 2013 17:26:22 +0000 (24 19:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Jun 2013 17:26:22 +0000 (24 19:26 +0200)
treed5c49945091edfce1218a78d63e1b2026cd0f151
parent3e6f11b240b3e607edfae40aec50863bc533483b
parent233edd4ddeb1ef3bc615cd06c8a814ebbd1a35ba
Merge branch 'MDL-40255_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE