Merge branch 'master' of github.com:FinalsClub/karmaworld into pdfjs
authorSeth Woodworth <seth@sethish.com>
Fri, 31 May 2013 22:54:17 +0000 (18:54 -0400)
committerSeth Woodworth <seth@sethish.com>
Fri, 31 May 2013 22:54:17 +0000 (18:54 -0400)

Trivial merge