Merge branch '1.2.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 4 Jun 2013 23:16:54 +0000 (19:16 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Tue, 4 Jun 2013 23:16:54 +0000 (19:16 -0400)
1  2 
test/regress/regress0/Makefile.am

Simple merge