Merge branch 'wip-MDL-41285-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Mar 2014 20:53:38 +0000 (21:53 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Mar 2014 20:53:38 +0000 (21:53 +0100)
commiteb4606aeb06c40ddbdf200fa516d923d9540fb96
tree2607a85605e03a4d4e1b10b4382da9d8cb8c9972
parent767a5a08d940144c6f00a06178df1bc1b43712fd
parent177052dc55868351be4095eed79d79f63418a064
Merge branch 'wip-MDL-41285-master' of git://github.com/marinaglancy/moodle