Merge branch '1.2.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 21 May 2013 22:58:32 +0000 (18:58 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Tue, 21 May 2013 22:58:32 +0000 (18:58 -0400)

Trivial merge