Merge branch 'MDL-44273' of https://github.com/NeillM/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Aug 2015 18:24:00 +0000 (20:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Aug 2015 18:24:00 +0000 (20:24 +0200)
commitf2755d847ef5c87809c79cbb5d3c599d6bbf2a61
tree2f7ef5413f9090f6c0557328ad3d2942aadf1715
parent1f65da81f5483d1a642d665f2df2943d6ee2271b
parent83f215850e1ac314865f1344c3ce9f7766feeefc
Merge branch 'MDL-44273' of https://github.com/NeillM/moodle