tree 16699632a54b86d87819ba83daac54a376989076
parent 5995d78ec9f6c30292bd2e25237a12b81d9aca62
parent 529e6c5127d5612d4cb875759beb5c9b53228d69
author abat <abat@bigswitch.com> 1375563760 -0700
committer abat <abat@bigswitch.com> 1375563760 -0700

Merge into master from pull request #42:
Big pull request - mainly to get the loxi_ir changes in (https://github.com/floodlight/loxigen/pull/42)