Merge branch 'w30_MDL-40627_m26_extramemorylimit' of https://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 21:04:13 +0000 (23:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 21:04:13 +0000 (23:04 +0200)
1  2 
config-dist.php

diff --cc config-dist.php
Simple merge