Merge pull request #25 from finalsclubdev/test
authorAndrew Magliozzi <Andrew@finalsclub.org>
Sat, 28 Jan 2012 20:18:16 +0000 (12:18 -0800)
committerAndrew Magliozzi <Andrew@finalsclub.org>
Sat, 28 Jan 2012 20:18:16 +0000 (12:18 -0800)
test to devel, merge seems to be broken


Trivial merge