Artifacts from https://github.com/floodlight/loxigen/compare/dea7bf2192788677f4d753fabcf5cc35ef81d2a4...9b15f2daec15bd773b037e10ba921f75426e1a2c

Loxigen Head commit floodlight/loxigen@9b15f2daec15bd773b037e10ba921f75426e1a2c
commit 9b15f2daec15bd773b037e10ba921f75426e1a2c
Merge: dea7bf2 acaf650
Author: abat <abat@bigswitch.com>
Date:   Sun Dec 15 15:42:28 2013 -0800

    Merge into master from pull request #157:
    Types: added 'matches' method to Masked<T> (https://github.com/floodlight/loxigen/pull/157)

commit acaf6505a5c361db371d817f94e87d4565991157
Merge: 12cea88 dea7bf2
Author: Andreas Wundsam <andreas.wundsam@bigswitch.com>
Date:   Sun Dec 15 15:08:21 2013 -0800

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

    Conflicts:
    	java_gen/pre-written/src/test/java/org/projectfloodlight/openflow/types/IPv4AddressTest.java

commit 12cea8891a87c361133ea0788174c25043968e0a
Author: Andreas Wundsam <andreas.wundsam@bigswitch.com>
Date:   Sun Dec 15 15:05:50 2013 -0800

    Types: added 'matches' method to Masked<T>

    + IPv4 based unittest