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)
commit6ca12c1cc192b36213f6c740ed4236ee84d63562
tree7a2bcdd96b993fd0dd275026208da78f22db9420
parent03612a7b0030fb9c3f1c4a4d933710610220fecb
parent47bf916773044bdc3337ef57d1086c03ad8b96f5
Merge branch 'w04_MDL-37767_m25_pgsocket' of git://github.com/skodak/moodle