merged master onto senslab2, manually solved conflicts in setup.py
[sfa.git] / LICENSE.txt
2008-12-05 Reed MoranLicense file