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)
commitcaf575e2bf657c73cdd20795d4ed2782787c6e5b
treea36315c01e22a90a5d8fb05ea6c79d6817524b6e
parentbfa2b0382f64d49c740e26d5b5baa8a180054cf0
parentb66e92689573af0b0a73f7bc67da1d2945b19ec7
Merge branch 'w51_MDL-36807_m25_mysocket' of git://github.com/skodak/moodle