Merge branch 'w51_MDL-36807_m25_mysocket' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Jan 2013 10:44:16 +0000 (11:44 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Jan 2013 10:44:16 +0000 (11:44 +0100)

Trivial merge