Merge branch 'capabilities_cache' of git://github.com/tlevi/moodle
commita6661ae0130ba94aeac64b8fc34ce7c2fd77a52b
authorDan Poltawski <dan@moodle.com>
Tue, 16 Jun 2015 07:45:40 +0000 (16 08:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Jun 2015 05:13:35 +0000 (18 07:13 +0200)
tree6a98f0ff58b284668193a5186097d3a4cc0e14e8
parent40d7ef8231272bbecec0110d8b9023f1d3dffe6e
parentaa7017432a81b048705192d8a2ffe70c2890e4de
Merge branch 'capabilities_cache' of git://github.com/tlevi/moodle