RobotWebTools/ros3djs — pull request #52 by rctoris (2013-08-23 15:14:12+00:00)
Title: merge conflict

conflict fix for https://github.com/RobotWebTools/ros3djs/pull/51