Merge branch 'masslnc' into better_abstraction
authorJason Stephenson <jason@sigio.com>
Sun, 17 Aug 2014 15:08:06 +0000 (11:08 -0400)
committerJason Stephenson <jason@sigio.com>
Sun, 17 Aug 2014 15:08:06 +0000 (11:08 -0400)

Trivial merge