relf/OpenMDAO-Framework — pull request #2 by JustinSGray (2014-11-21 15:49:13+00:00)
Title: Needed to update you to the latest dev

Dev just got a huge pull from our own development work. So I needed to update your branch with that. I fixed a conflict that arose from that.