From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 4 Jun 2015 14:34:21 +0000 (-0400)
Subject: Merge branch '4.6' into 'master'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=757fc7f21936ac57c7e33ab93aa4490407cf9c8b;p=civicrm-core.git

Merge branch '4.6' into 'master'

Conflicts:
	tools/CRM/Auction/BAO/Auction.php
	tools/CRM/Auction/BAO/Item.php
	tools/CRM/Auction/Form/Auction.php
	tools/CRM/Auction/Form/Item.php
---

757fc7f21936ac57c7e33ab93aa4490407cf9c8b