PX4/Firmware — pull request #651 by julianoes (2014-02-11 14:36:22+00:00)
Title: Startup: fix merge mistake

Somehow git messed up when master was merged into beta.