tree 6c47f2dc5c5c7bf26b33e5b72ef903ea6169374d
parent 1019d835544fd7a0ff6d3cc92e22e253b7a049ee
parent 6edc8ab14296e45d2d67a5aa4e752543d1a4feb7
author abat <abat@bigswitch.com> 1371512483 -0700
committer abat <abat@bigswitch.com> 1371512483 -0700

Merge into master from pull request #25:
add automerge test script (https://github.com/floodlight/loxigen/pull/25)