MIME4J-218: Content-Type fallback character set
contributed by Wolfgang Fahl <wf at bitplan.com>

git-svn-id: https://svn.apache.org/repos/asf/james/mime4j/trunk@1635743 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'trunk' of https://github.com/WolfgangFahl/james-mime4j into trunk

Conflicts:
	core/src/main/java/org/apache/james/mime4j/stream/DefaultFieldBuilder.java
	dom/src/main/java/org/apache/james/mime4j/message/BasicBodyFactory.java
	dom/src/test/java/org/apache/james/mime4j/dom/MessageCharsetLenientTest.java
fix merge