Merge changes I994c19ee,I245e9e7a
[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