Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Mon, 6 Oct 2014 22:58:54 +0000 (18:58 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Mon, 6 Oct 2014 22:58:54 +0000 (18:58 -0400)
1  2 
src/theory/sets/theory_sets_private.cpp
test/regress/regress0/Makefile.am

Simple merge