vcs.fsf.org Git - civicrm-core.git/commit

author	Pradeep Nayak <pradeep.nayak@webaccess.co.in>
	Wed, 6 Aug 2014 16:24:53 +0000 (21:54 +0530)
committer	Pradeep Nayak <pradeep.nayak@webaccess.co.in>
	Wed, 6 Aug 2014 16:24:53 +0000 (21:54 +0530)
commit	c4ccd1406813e7cb4aee08612ed8f8666aaeae8e
tree	5b861b5c0ed85a815294c5f4f155749882a339c2	tree \| snapshot (zip tar.gz)
parent	6fb35ace2e95e84c53051422aa8c1a7398069a9b	commit \| diff
parent	6f39f13ad9e23a74ebd7c9debad3985d88ce56a8	commit \| diff

Merge branch 'VAT-417-Push' of github.com:Parag18/civicrm-core into Parag18-VAT-417-Push

Conflicts:
CRM/Contribute/Form/Task/Invoice.php