Merge branch 'MDL-48107_master' of https://github.com/markn86/moodle
commitbea7509414977c13657ed6cfc0a19f7794895284
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 8 Nov 2014 10:19:59 +0000 (8 11:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 8 Nov 2014 10:19:59 +0000 (8 11:19 +0100)
treed2bc27247f3c98fee91fc3f72b0bf32941b7808d
parent17cc9fcd84d204cb12be3aa11c382214dad38d6f
parent8145ab3372b2cc0c75ba2fa5fcc3f7732b4d0109
Merge branch 'MDL-48107_master' of https://github.com/markn86/moodle