branch:moar-features
commit:36ea3b905af857cc4165b002e71a2f5060326185
author:Chip Black
committer:Chip Black
date:Mon Dec 7 01:41:10 2015 -0600
Add image composition