pingpong-labs/admin — pull request #2 by johnnye (2014-02-07 16:29:30+00:00)
Title: cleaning up merge conflicts.

There are numbers merge conflicts in this file. I might have removed incorrect ones.