Merge branch 'master' of github.com:/finalsclubdev/FinalsClub
authorec2-user <ec2-user@fcdev4.finalsclub.org>
Sun, 20 Nov 2011 02:21:46 +0000 (02:21 +0000)
committerec2-user <ec2-user@fcdev4.finalsclub.org>
Sun, 20 Nov 2011 02:21:46 +0000 (02:21 +0000)

Trivial merge