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

Conflicts:
	Changes
	OnlineThirdPartyPayment.pm

diff --cc Changes
index b8826bf,22f69d6..39befca
--- 1/Changes
--- 2/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
  

diff --cc OnlineThirdPartyPayment.pm
Simple merge