Merge branch 'MDL-42377_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE
commit183058c8b577d04ac088e1de3767944b9619a660
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Oct 2013 23:13:46 +0000 (25 01:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Oct 2013 23:13:46 +0000 (25 01:13 +0200)
tree13fbd805e279961e2031a5758b8eed826b044a01
parent3a32362a3059ace0abe0151f0fe183aaf472cc55
parentfae00b43fe90fd5b26c021e87ac2acb5d27b2903
Merge branch 'MDL-42377_m25' of https://github.com/markn86/moodle into MOODLE_25_STABLE