Merge branch '1.3.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Wed, 18 Dec 2013 19:27:55 +0000 (14:27 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Wed, 18 Dec 2013 19:27:55 +0000 (14:27 -0500)
[skip ci]

1  2 
configure.ac

diff --cc configure.ac
Simple merge