Chris Beams ee34695bc4 Merge branch 'master' into buildSrc-extraction ...

Conflicts:
	spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java

2010-11-11 10:13:14 -08:00

..

src

INT-1597 Fix Sporadic Test Failure in IP

2010-11-09 22:31:29 -05:00

template.mf

Add Bundle-Version and placeholder to all Bundlor templates

2010-11-09 10:33:14 -08:00