tree 5f53f7e9dd60164c53de2069c58f6ee8c43a10af
parent b85d044f83bb4f811232d97db4bb7626222cac83
parent 7b6e210d7ad8147358685f513fab98f58a79039b
author EmergentOrder <lecaran@gmail.com> 1446570286 -0400
committer EmergentOrder <lecaran@gmail.com> 1446570286 -0400

Merge branch 'fcvarela-develop' into develop