Merge branch '47684-28' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 15:31:08 +0000 (16:31 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:16 +0000 (11:48 +0200)
commit3456ac3ba0692926f86c0c2c7a1a58c49ca35bb1
tree665de54d3820f7e165fcd08ff019e4d76144da0d
parent276af2a44dc6dee51f9e32c7eb97c5db7ed045b8
parentd28e0a2f7663eefe769337def5375b11819bec9a
Merge branch '47684-28' of git://github.com/samhemelryk/moodle