Merge branch 'MDL-42866-master' of git://github.com/damyon/moodle
commit474719d327fb5b5a7ccfff87136b963941f3a307
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 13 Nov 2013 22:09:09 +0000 (13 23:09 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 13 Nov 2013 22:09:09 +0000 (13 23:09 +0100)
tree730f85d1d2e295fd42375085bb7dee47402a3037
parente4af9616c3335d1804ee44d1be8dffb2d2c4cad9
parent60f0cd6bcdce547fc40c05f531e4b51556778177
Merge branch 'MDL-42866-master' of git://github.com/damyon/moodle