jordi-puig/opennaas — pull request #2 by adrian-rosello (2012-05-10 07:29:11+00:00)
Title: Fix/merge ws

Conflicts solved.