Merge changes Ia7cd7eda,If961a029,I9f6a57a2,Id8551489
[controller.git] / LICENSE
2013-03-23 Giovanni MeoMerge "removed dead code that was causing a warning"
2013-03-23 Ed WarnickeAdded a LICENSE file, fixed/added a few license headers. 69/69/1