Merge branch 'MDL-47979-29-blocks-config' of git://github.com/mudrd8mz/moodle into...
commit12c17ffaeed66bc349efe8be34f7eb32defd86cb
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Nov 2015 22:44:20 +0000 (9 23:44 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Nov 2015 22:44:20 +0000 (9 23:44 +0100)
tree324929f80b8dc28b0f8ada5c0ebb69681277566e
parenteb7fb329287605b5e22c80eec0e7e538cec67ea1
parent663287d08f5595a3d383f0441846cc495fdeeb43
Merge branch 'MDL-47979-29-blocks-config' of git://github.com/mudrd8mz/moodle into MOODLE_29_STABLE