shivamkalra/DVD-Rental-System — pull request #9 by nishantbhatt (2012-03-06 01:26:00+00:00)
Title: Merging error resloved

Now info files are updated and merging error is resolved.