Merge branch '1page' of github.com:/finalsclubdev/FinalsClub into 1page
authorec2-user <ec2-user@fcdev4.finalsclub.org>
Sun, 13 Nov 2011 21:03:22 +0000 (21:03 +0000)
committerec2-user <ec2-user@fcdev4.finalsclub.org>
Sun, 13 Nov 2011 21:03:22 +0000 (21:03 +0000)
commit586c66fc59acfec19b515f3ac58326fedabcaae7
treea737121ba4daceaf8567456787ff1a9cbb6073e3
parent10fe6a00ea595d35334d0c6779778fa7eeb45d86
parent5c0292c051b8fa1b1021096df8c511f5908d3f2b
Merge branch '1page' of github.com:/finalsclubdev/FinalsClub into 1page
public/index.html