tree 595b2b79557de591a29958dcee5ccc1551a53191
parent 22ba3af1e4cb3b309207df620cebef1012f4c9a8
parent 5326ca419438e49130477a9b9a6aa87548c6072b
author Andreas Wundsam <andreas.wundsam@bigswitch.com> 1381187932 -0700
committer Andreas Wundsam <andreas.wundsam@bigswitch.com> 1381187932 -0700

Merge branch 'master' of github.com:floodlight/loxigen into funnel

Conflicts:
	java_gen/java_type.py
	java_gen/templates/of_factory_interface.java