Merge pull request #2443 from MartinThoma/master
authorEvan Shelhamer <shelhamer@imaginarynumber.net>
Mon, 11 May 2015 22:20:06 +0000 (15:20 -0700)
committerEvan Shelhamer <shelhamer@imaginarynumber.net>
Mon, 11 May 2015 22:20:06 +0000 (15:20 -0700)
python: PEP8; changed docstring documentation style to NumPyDoc style


Trivial merge