From: Mark Wells <mark@freeside.biz>
Date: Tue, 2 Jul 2013 22:54:00 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/Business-OnlineThirdPartyPayment
X-Git-Url: http://git.freeside.biz/gitweb/?p=Business-OnlineThirdPartyPayment.git;a=commitdiff_plain;h=250ee4d7c29d6814fcbf0d38bcec30d6a099ccb1

Merge branch 'master' of git.freeside.biz:/home/git/Business-OnlineThirdPartyPayment

Conflicts:
	Changes
	OnlineThirdPartyPayment.pm
---

250ee4d7c29d6814fcbf0d38bcec30d6a099ccb1
diff --cc Changes
index b8826bf,22f69d6..39befca
--- a/Changes
+++ b/Changes
@@@ -1,7 -1,8 +1,9 @@@
  Revision history for Perl extension Business::OnlineThirdPartyPayment.
  
- 0.10  unrelesed
-         - complete rewrite
- 0.01  unreleased
+ 0.10 unreleased
+         - rewrite by mark
+ 
+ 3.00_09 unreleased
++>>>>>>> a9ea9b31bead46acca268b0a31564fdabbacb96d
  	- original version; created by jeff