Andrzej Cichocki a652c8b19f Merge commit '22af527b7943c0c4376af582de6505893817111a' into andr3ej-ross-merge ... # Conflicts: # docs/source/changelog.rst		2017-12-19 17:07:17 +00:00
..
capsule	Merge remote-tracking branch 'open-hc01/master' into colljos-os-hc01-merge-111217	2017-12-11 09:21:52 +00:00
src	Merge commit '22af527b7943c0c4376af582de6505893817111a' into andr3ej-ross-merge	2017-12-19 17:07:17 +00:00
build.gradle	Fixing stuff	2017-12-18 15:39:08 +00:00