Merge branch 'MDL-49379_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Mar 2015 09:46:18 +0000 (10:46 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Mar 2015 09:46:18 +0000 (10:46 +0100)
commitde2f05d50d98c8042e2dc7cc887551243de137cb
treeaddf91aadd9d250a37a50a33f147ae14c6ddb0a3
parent553319be03c4ef8e62499841c8d5d94c6786ed6d
parent05536ad1651c69ce5fed4d96b6412cf7b31230f2
Merge branch 'MDL-49379_master' of git://github.com/markn86/moodle