killbill-memoizeit

PFFFF...

Conflicts:
	entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementSqlDao.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EventSqlDao.java
	entitlement/src/main/resources/com/ning/billing/entitlement/engine/dao/EventSqlDao.sql.stg
	payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentApi.java
	payment/src/main/java/com/ning/billing/payment/provider/PaymentProviderPlugin.java
	payment/src/test/java/com/ning/billing/payment/provider/MockPaymentProviderPlugin.java

stephane brossier

Commit: e25112b

Tree: 255f5ec

Parents: ee32296
2f8a863

Payment api change to include context

4/12/2012 5:31:29 PM

alena

Commit: 2f8a863

Tree: 59cc961

Parents: 8c9dfeb

Merge branch 'integration' into payment-plus-account

4/12/2012 1:48:34 PM

alena

Commit: 8c9dfeb

Tree: 1be657e

Parents: ec8beb6
067c9d4