Andrzej Cichocki a652c8b19f Merge commit '22af527b7943c0c4376af582de6505893817111a' into andr3ej-ross-merge ... # Conflicts: # docs/source/changelog.rst		2017-12-19 17:07:17 +00:00
..
java/net/corda/core	Merge remote-tracking branch 'open/master' into colljos-os-merge-rc01	2017-12-18 10:24:38 +00:00
kotlin/net/corda/core	Merge commit '22af527b7943c0c4376af582de6505893817111a' into andr3ej-ross-merge	2017-12-19 17:07:17 +00:00