strands-project/strands_movebase — pull request #4 by nilsbore (2014-10-21 10:20:46+00:00)
Title: Merging master branch to hydro-devel

Needed to resolve a conflict to merge to hydro-devel from master. Development happens on hydro-devel from now on.