Merge branch '1.3.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 17 Dec 2013 23:56:24 +0000 (18:56 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Tue, 17 Dec 2013 23:56:24 +0000 (18:56 -0500)
commitc1b9172df7d56eb691aa93c823deb9c65368659e
treec3b2ad31b8548435747748bbcac5133bdba40493
parentf411ca8ce97f488fd0db0a79abe8b4e61521ae69
parentaa1f9cc31014bfc916134e14a008fb5463348324
Merge branch '1.3.x'
configure.ac