tree 3041cab0a4f0f8fc0869afb0cf723c23f45a9f88
parent 7e1551e20d91ac10d478843c6f4858ac60257d65
parent e499bd1f54c85c64f04f382876ac50d246cde277
author abat <abat@bigswitch.com> 1414789764 -0700
committer abat <abat@bigswitch.com> 1414789764 -0700

Merge into master from pull request #342:
loci: begin removing inheritance unions (https://github.com/floodlight/loxigen/pull/342)