Merge branch 'MDL-49041' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 20:08:20 +0000 (21:08 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 20:08:20 +0000 (21:08 +0100)
commit10598f2485189722fab4792f27572d217ba50c03
treebc88e7ed620d2d52dd26af04010ce7f87afc7fb6
parentd1b94e543704ea9f908bb0f2696af6facbd8db40
parent86969816c6a3da939758e0b7c920a6dfb3dfee0e
Merge branch 'MDL-49041' of git://github.com/timhunt/moodle