Merge branch 'MDL-49073-master' of git://github.com/jethac/moodle
commit8bcc97f0560729ef05a028e08a501cf1e525773b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Feb 2015 00:04:38 +0000 (10 01:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Feb 2015 00:04:38 +0000 (10 01:04 +0100)
tree1b7ee4d8a4b68542e64aeba98f2e407be1bdfcae
parentc874c3c45561fd01321529ffbf01e07d601a1759
parenta952ed04d14228557c43ab90bbee775913146bf6
Merge branch 'MDL-49073-master' of git://github.com/jethac/moodle