merge proof correction master
authorAdam Megacz <megacz@cs.berkeley.edu>
Sun, 11 May 2014 00:47:11 +0000 (17:47 -0700)
committerAdam Megacz <megacz@cs.berkeley.edu>
Sun, 11 May 2014 00:47:44 +0000 (17:47 -0700)

Trivial merge