Merge branch 'MDL-42377_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE
commit3b34d79d3662adc2e5bd33298f87f93a97226358
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Oct 2013 23:13:08 +0000 (25 01:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Oct 2013 23:13:08 +0000 (25 01:13 +0200)
tree1abc3d8929bfe36858a5a859d580876b52c88baf
parent8f19a957e2aa9d5ec9a0c5f5a236f7b0a8ea83d9
parent969d8f0e3ff4d2aa2e0f52785023b299c5564c1b
Merge branch 'MDL-42377_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE