Merge remote-tracking branch 'upstream/master' into sets-mergable
authorKshitij Bansal <kshitij@cs.nyu.edu>
Tue, 7 Oct 2014 23:17:11 +0000 (19:17 -0400)
committerKshitij Bansal <kshitij@cs.nyu.edu>
Tue, 7 Oct 2014 23:17:11 +0000 (19:17 -0400)

Trivial merge