misc: merge with sytle checker fix
authorJason Lowe-Power <powerjg@cs.wisc.edu>
Fri, 1 Jul 2016 15:37:57 +0000 (10:37 -0500)
committerJason Lowe-Power <powerjg@cs.wisc.edu>
Fri, 1 Jul 2016 15:37:57 +0000 (10:37 -0500)
commit7c291677a842c16fe61296dcfa67556a20dda479
tree8ba1d37f65a64bfb349ca1fc28f6089cb7dd16c6
parent134824e84725fca8d9e46c012e674e551babef28
parent57e3f401006567f8cfd113133a6ba2518f7ee9c2
misc: merge with sytle checker fix

Oops.