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)
commitc33d53d005c41cf5705a85f86311d8d0142d2a01
treebf57bd57e84b71122c4a748d228125126a3f40fd
parent5fa40f4898d61c23e6d2d47a2963886898ecc939
parent28d95f84b62d2c00b475d0204bfac7d77d679586
Merge branch '1.3.x'

[skip ci]
configure.ac