Merge branch 'w04_MDL-37767_m25_pgsocket' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 23:51:01 +0000 (00:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 23:51:01 +0000 (00:51 +0100)

Trivial merge