Merge tag '4.6.10' of https://github.com/civicrm/civicrm-core into 4610 4610
authorLisa Marie Maginnis <lisam@fsf.org>
Wed, 4 Nov 2015 22:39:31 +0000 (17:39 -0500)
committerLisa Marie Maginnis <lisam@fsf.org>
Wed, 4 Nov 2015 22:39:31 +0000 (17:39 -0500)

Trivial merge