Merge branch 'master' of github.com:sethwoodworth/FinalsClub into devel
authorSeth Woodworth <seth@sethish.com>
Mon, 23 Jan 2012 00:30:00 +0000 (19:30 -0500)
committerSeth Woodworth <seth@sethish.com>
Mon, 23 Jan 2012 00:30:00 +0000 (19:30 -0500)

Trivial merge