Merge branch 'MDL-49185-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Jul 2015 07:54:42 +0000 (09:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Jul 2015 14:59:19 +0000 (16:59 +0200)
commitcc623a384f1e671e519b23fcd7e120ecb76fdfb0
treed6fa0b514b155e1a04941f4a30089c8767ff019a
parent6bf2e10e0a7694c04bd6508cbf226b2b4c322ebf
parent01f38dd0e2853340f10da515ba141f2473086ae0
Merge branch 'MDL-49185-master' of git://github.com/lameze/moodle