tree af7b21399fbb1cbb283bc90871955330e32f77a9
parent e90685c051ff6eb091adad232adf90e30ea140ab
parent 5d175fb1e7e0452d888d88d67cd4e86d6fb1eb29
author Rich Lane <rlane@bigswitch.com> 1366344882 -0700
committer Rich Lane <rlane@bigswitch.com> 1366345009 -0700

Merge branch 'master' into pyloxi-1.3

Also added ofp_hello_elem_type to standard-1.3.

Conflicts:
	loxi_front_end/translation.py