Merge branch '1.0.x', getting fix for bug 480
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 11 Dec 2012 23:31:41 +0000 (18:31 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Tue, 11 Dec 2012 23:31:41 +0000 (18:31 -0500)
commit0b75194fc6feb6bd8989c7d3d85571a07af53d56
treed30e580b812aff867fa4f7d54df63c5ff23b8a87
parent7630ac13e5571d650cac2c25cc062bc883bd5ee7
parent0e3dc441641c64e6137d85f8d7eaeb78ee562e51
Merge branch '1.0.x', getting fix for bug 480