clintbellanger/flare-engine — pull request #1138 by dorkster (2014-08-04 19:47:14+00:00)
Title: Properly handle merge stacks in equipment inventory

Fixes #1137