Merge branch 'MDL-42815-master' of git://github.com/sammarshallou/moodle
commit438ee6ebdc99ddb5b4de3102c973bff3c811e994
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Dec 2013 22:24:56 +0000 (10 23:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Dec 2013 22:24:56 +0000 (10 23:24 +0100)
tree05de86e4cece7f0bd46db5194962706a016fbb8f
parentdf1498f711bd173787dc1326c7b94287bcad3388
parent40e8f0260cdc2f025b377967d13ef19fcec0a98d
Merge branch 'MDL-42815-master' of git://github.com/sammarshallou/moodle