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)
commit10ab2b6492dc0b725abbb41d4e5aa423252b8a59
tree887e29db809d11a08370bd7f532f78a80a36d9b0
parent25a01d31bffcdcc339dce332ac893460b5f4cdcf
parentd813626606c5eca8179eec492090b85dbd818867
Merge branch '1.2.x'
test/regress/regress0/Makefile.am