Merge branch 'master' into 5.x
authorKasper Sørensen <i.am.kasper.sorensen@gmail.com>
Tue, 13 Jun 2017 02:05:50 +0000 (19:05 -0700)
committerKasper Sørensen <i.am.kasper.sorensen@gmail.com>
Tue, 13 Jun 2017 02:05:50 +0000 (19:05 -0700)
commit16a5e715764e85143099b848e1dc943d196e1894
treea7d7c26b1a6c31315afe90c1ef9bc19eb76cde79
parent78d85d6d322590adf66b37c75c28f43703f73933
parentbf32dfe313b18e861376fbe9cce2af6ddabbb5ea
Merge branch 'master' into 5.x

Conflicts:
CHANGES.md
csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java
CHANGES.md
csv/pom.xml
csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java
salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java