ADD: eclipse/ in gitignore
Merge remote-tracking branch 'origin/manfred' into alex
Merge remote-tracking branch 'origin/manfred' into alex
gitignore: delete eclipse/
Merge remote-tracking branch 'origin/manfred' into alex
Merge remote-tracking branch 'origin/roland' into alex
Merge remote-tracking branch 'origin/roland' into alex
repaired bundle-version
Merge remote-tracking branch 'origin/roland' into alex
Merge branch 'nathan' of https://github.com/OpenNTF/org.openntf.domino into declan
MOVED: icu4j to separate folder. Using linked source now
MOVED. formula engine to separate project
Further testing the formula engine.
Further testing the formula engine.
The formula project itself compiles and seems to work
Everything compiles.... work still in progress
Merge remote-tracking branch 'origin/manfred' into roland

Conflicts:
	org.openntf.domino.formula/src/org/openntf/domino/formula/FormulaContext.java
	org.openntf.domino.formula/src/org/openntf/domino/formula/FunctionFactory.java
	org.openntf.domino.formula/src/org/openntf/domino/formula/module/TextFunctions.java
Committed before renaming the package
Renamed it... fixing compile errors & dependencies
Further testing the formula engine.