missed a conflict

Merge branch 'rails3' of http://github.com/merbjedi/active_merchant

Merge branch 'master' of http://github.com/Shopify/active_merchant

Modified parent Braintree gateway to include all necessary static information (e.g. countries, card types) so that it behaves like other gateways.

Added braintree gem as an official dependency to support the new 'Blue' platform and updated Changelog and Contributors accordingly.

Add support for Braintree Blue Gateway

Gem version 1.6.0

Added activemerchant.rb to project so that gem correctly outrequires

Switched to active_merchant/common include

Add task for listing outbound hosts with port

fix chronopay test failure under 1.9.1

Fix timezone issue in test

Fix failing Garanti unit test

Fix the failing CyberSource remote test. The CyberSource gateway responds with a 500 for invalid logins so ActiveMerchant::Connection raises a ResponseError instead of returning the response itself [Patrick Joyce]

Added support for Garanti Sanal Pos, Turkish bank and billing gateway. All Code contributed by Selem Delul. Thanks!