Merge from 1.0.x (bugfix for 476).
authorMorgan Deters <mdeters@cs.nyu.edu>
Sat, 8 Dec 2012 14:38:24 +0000 (09:38 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Sat, 8 Dec 2012 14:38:24 +0000 (09:38 -0500)
commita8a471141d2fca4428b7c016ea4494d9925fc544
treef78f491c6cc9fbbe4ab04251588c1b5beb5b3824
parentee50792314754c1ed7ef982877165d8b90c1b21d
parent984d9e7352ece4e3dd75b4272074cf6a298b5eea
Merge from 1.0.x (bugfix for 476).