kafene/flight — pull request #1 by kafene (2012-12-31 17:42:06+00:00)
Title: merging master

theres probably a better way to do this than sending myself a pull request