12/6/2011 1:38:57 AM
into payment-work
Conflicts:
api/src/main/java/com/ning/billing/payment/api/PaymentApi.java
api/src/main/java/com/ning/billing/payment/api/PaymentMethodInfo.java
payment/src/main/java/com/ning/billing/payment/CreditCardPaymentMethod.java
payment/src/main/java/com/ning/billing/payment/api/DefaultPaymentApi.java
payment/src/main/java/com/ning/billing/payment/provider/PaymentProviderPlugin.java
