Merge branch '1.3.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 17 Dec 2013 22:14:45 +0000 (17:14 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Tue, 17 Dec 2013 22:14:45 +0000 (17:14 -0500)
commitf411ca8ce97f488fd0db0a79abe8b4e61521ae69
tree4112cd96e30928f4b57787eabe98a0aaa178540e
parent5186ca79710fe935d1f7ed27c4a34e913ab547e8
parent464bbe3b057bde32b9e0e1aa1f989818dba585db
Merge branch '1.3.x'

Conflicts:
COPYING
NEWS
COPYING
NEWS
configure.ac