Merge branch 'MDL-45364-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Dec 2015 01:35:53 +0000 (02:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 10:16:33 +0000 (11:16 +0100)
commit40cd9f9ac9fd4ff0f227c24b08c6b15a25911fc7
tree98d8333da241005bae5d181e45819d55f73d56c4
parentb80ede13a61124162ded43ac5595f22cf73d4da9
parent17fda969ff4bf60427ecab9ffb2297ad5e6ed995
Merge branch 'MDL-45364-master' of git://github.com/danpoltawski/moodle