chili-epfl/nao_ros_cowriter — pull request #31 by dhood (2014-06-07 12:48:53+00:00)
Title: fix incorrect rebase

accidentally removed 6 commits