Merge branch '1.0.x' (getting fix for bug 479)
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 11 Dec 2012 22:56:53 +0000 (17:56 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Tue, 11 Dec 2012 22:56:53 +0000 (17:56 -0500)
commit7630ac13e5571d650cac2c25cc062bc883bd5ee7
tree07c05e7509fb0e05bd389bffeeebe4121e3f4809
parent2e67a8e49277140700881e010dddcc9f30cfbc1e
parent5eaeeb2156a9d035250ed8ec5af6391995bb10f5
Merge branch '1.0.x' (getting fix for bug 479)