Merge branch 'master-mdl33971' of https://github.com/tlock/moodle
commit3e1a05790d2fcfc93ea8d93e5397edabd337e2eb
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 16:17:06 +0000 (3 17:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 16:17:06 +0000 (3 17:17 +0100)
treed95f30e70324f1c354046de292b47457c0236122
parent6cc00494e2a71854422f79f8f876eadfefdacd76
parent579f849928568d2301eda7284b03a658bce7fc1c
Merge branch 'master-mdl33971' of https://github.com/tlock/moodle