{ahornung->ros-nao}
Merge branch 'devel'
Merge branch 'devel'
Removed the Python camera driver

It has been moved to nao_camera since a few months
Merge pull request #35 from keulYSMB/naoqi2compat

modify nao_driver for naoqi2 compatibility
[python] better threading for NaoNode (with ROS shutdown handling)
also do a few import cleanups
Merge pull request #33 from vrabaud/devel

better threading for NaoNode (with ROS shutdown handling)
Merge pull request #29 from severin-lemaignan/remove_camera

Remove the Python camera driver
mention nao_sensors instead of nao_camera
respect PEP008
update maintainers
Armin, thank you for all your work, in ROS, Octomap and NAO.
Good luck out of the university !
update changelogs
Merge branch 'devel'
0.3.0
rectify the doc as we are now using GitHub flow again
updated generation script
updated PEP8 compliant script and library
Merge branch 'urdfgeneration' into commitUrdf

Conflicts:
	nao_description/scripts/generate_urdf.py
	nao_description/src/nao_description/gazeboUrdf.py
	nao_description/src/nao_description/urdf.py
	nao_driver/nodes/nao_diagnostic_updater.py
	nao_driver/nodes/nao_sensors.py
	nao_driver/src/nao_driver/nao_driver_naoqi.py