floodlight/loxigen — pull request #321 by rlane (2014-10-10 22:39:30+00:00)
Title: Merge master into of14 branch

Reviewer: trivial

Also includes a fix to the input files to get it to unify.