tree d1dfcb787766e2355cbf88e6294e3b356b6a4153
parent c78ab35922193c69561dcff94a89ff1a6eda1001
parent b38853318e5b1a3ceb9c221dd4f253117d8ed73a
author James Lott <james@lottspot.com> 1483457986 -0500
committer GitHub <noreply@github.com> 1483457986 -0500

Merge pull request #61 from Rtzq0/issue_60

Add functionality for overriding dictionary merges.