killbill-aplcache

Merge branch 'master' of github.com:iKentoo/killbill into …

iKentoo-master

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>

Conflicts:
	beatrix/pom.xml
	invoice/src/main/java/org/killbill/billing/invoice/glue/DefaultInvoiceModule.java
	invoice/src/test/java/org/killbill/billing/invoice/InvoiceTestSuiteWithEmbeddedDB.java
	invoice/src/test/java/org/killbill/billing/invoice/TestInvoiceHelper.java
	osgi-bundles/bundles/jruby/pom.xml
	osgi-bundles/bundles/logger/pom.xml
	osgi-bundles/libs/killbill/src/main/java/org/killbill/killbill/osgi/libs/killbill/OSGIKillbillAPI.java
	osgi/pom.xml
	osgi/src/main/java/org/killbill/billing/osgi/DefaultOSGIKillbill.java
	osgi/src/main/java/org/killbill/billing/osgi/KillbillActivator.java
	util/src/main/java/org/killbill/billing/util/config/OSGIConfig.java

Merge remote-tracking branch 'upstream/osgi-shiro'

security: implement DefaultSecurityApi#logout() Signed-off-by: …

Pierre-Alexandre Meyer <pierre@mouraf.org>

Merge remote-tracking branch 'upstream/osgi-shiro'

osgi: export SecurityApi to bundles Signed-off-by: Pierre-Alexandre …

Meyer <pierre@mouraf.org>

#201: Ability to use localized email subject

Added InvoicePluginApi: ability to add additional items to …

invoices before sealing

Added InvoicePluginApi: ability to add additional items to …

invoices before sealing

Fix small payment issues (beatrix tests) in notifyChargeback …

and for missing Payment events.

Fix Payment retry logic -- at least enough to have retries work …

from Beatric tests