Merge pull request #1473 from longjon/pytest
authorEvan Shelhamer <shelhamer@imaginarynumber.net>
Thu, 22 Jan 2015 08:29:35 +0000 (00:29 -0800)
committerEvan Shelhamer <shelhamer@imaginarynumber.net>
Thu, 22 Jan 2015 08:29:35 +0000 (00:29 -0800)
Python testing

1  2 
Makefile

diff --cc Makefile
Simple merge