isenseDev/rSENSE — pull request #177 by jdalphon (2013-03-18 14:28:21+00:00)
Title: Fixing issue with bad merge

Some merged files contained traces of the merge (bad). Fixed