tarunbhardwaj/project_billing — pull request #6 by simmianand (2013-03-14 05:18:50+00:00)
Title: Conflicts removed

Issue resolved in billing.py