pulled in latest from tom and josh

diff --git a/ChangeLog b/ChangeLog
index ef4905a25cd7bd1c06e03dfeb773ef608ca1b3df..db4ea36f45e29810b77e7c2c4a2ec381620a4089 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
 -- refactored splitter fallback
 -- fix binder.use.service
 -- refactored flow state
+-- latest from tom and josh 10/22 15:27
 
 125
 -- discovered can't catch exceptions thrown from Lua to C++; need to