ipa320/softkinetic — pull request #39 by ipa-fmw (2014-10-15 06:11:14+00:00)
Title: [indigo_dev] Bring in hydro_dev changes to indigo_dev

merging hydro_dev to indigo_dev should be ok to bring in new features and bug fixes.

This can currently not be automatically merged, so please merge manually and resolve merge conflicts.