bdavenport/dump1090 — pull request #12 by terribl (2013-06-03 07:59:20+00:00)
Title: Master merge

Let's see how this went... Used `git mergetool` and Diffuse from http://diffuse.sourceforge.net/