Merge branch '1.2.x'
authorKshitij Bansal <kshitij@cs.nyu.edu>
Mon, 26 Aug 2013 23:48:10 +0000 (19:48 -0400)
committerKshitij Bansal <kshitij@cs.nyu.edu>
Mon, 26 Aug 2013 23:48:10 +0000 (19:48 -0400)

Trivial merge