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)
commitf4d00e2eda23702ab2d251c03ccbd5129a202e68
tree2283cb23c441c32b56ccbd08cf0833a8dee0fcec
parent0b08128b04e1ee2d2a79ce3965aebdba457ae8ef
parentb2e350b15cdec5a747fbcee9afb3109988fddc0c
Merge pull request #25 from finalsclubdev/test

test to devel, merge seems to be broken