Merge branch '35597-27' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jan 2014 15:39:00 +0000 (16:39 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jan 2014 15:39:00 +0000 (16:39 +0100)
commitda47e297da5951e87928ea99405ed4a1e081647a
tree3605c5157f42a7bf7da1775e57357830f25b0f5e
parent1b92203ef3582b8b7a6a807c2ef25b94f07c780b
parente5e0d397f43a48f946affe86fbb23274e8eb30e8
Merge branch '35597-27' of git://github.com/samhemelryk/moodle