Merge branch 'wip-MDL-30315-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Aug 2015 12:20:01 +0000 (13:20 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Aug 2015 16:30:33 +0000 (18:30 +0200)
commita9334960dd5a12a77e305cc5fdd4bf91cd077337
treec554730cf66097d03aab0100ea3622f6524cb72a
parent839b8c39053390c3517dcb887c0054fe6b72d85a
parent9b272cc0699469f135394eedaf824d06d1b7e4d0
Merge branch 'wip-MDL-30315-master' of git://github.com/abgreeve/moodle