Merge "master" into "ovn".
authorBen Pfaff <blp@nicira.com>
Tue, 17 Mar 2015 15:50:06 +0000 (08:50 -0700)
committerBen Pfaff <blp@nicira.com>
Tue, 17 Mar 2015 15:50:06 +0000 (08:50 -0700)
This will allow taking advantage of the new command-line infrastructure.

1  2 
configure.ac

diff --cc configure.ac
Simple merge