Back-merge
authorEvan Shelhamer <shelhamer@imaginarynumber.net>
Sat, 20 Sep 2014 05:31:52 +0000 (22:31 -0700)
committerEvan Shelhamer <shelhamer@imaginarynumber.net>
Sat, 20 Sep 2014 05:31:52 +0000 (22:31 -0700)
commit07ded295e389fd1a63881b8fd67e1751363372ce
tree2c9dfd1f3c4adb71add3b2dc2010af528dac68d3
parent2f45b2109b1fb6080abe035d1a8e0684cda13bb5
parent8623598efb4d9d515cf0111cd2dbefd78580a191
Back-merge