floodlight/loxigen — pull request #144 by andi-bigswitch (2013-11-26 04:42:34+00:00)
Title: Merge master->java-blackbird

CC: @vaterlaus @yotamhc @ronaldchl

This brings the java-blackbird branch up-to-date with the current master version of Loxigen.