Merge branch '1.3.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Fri, 21 Feb 2014 23:16:38 +0000 (18:16 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Fri, 21 Feb 2014 23:16:38 +0000 (18:16 -0500)
1  2 
src/theory/uf/theory_uf.cpp

Simple merge