cyclus/cyclus — pull request #1048 by scopatz (2014-11-25 00:55:42+00:00)
Title: pyne update

normal amalgamation updates.