Merge branch 'issue130_diagram_updates'
authorJoel Martin <github@martintribe.org>
Mon, 11 Jan 2016 17:58:16 +0000 (11:58 -0600)
committerJoel Martin <github@martintribe.org>
Mon, 11 Jan 2016 17:58:16 +0000 (11:58 -0600)
commite7f7c143146b6c22239f8ca0bdd641579a4ea27c
tree76fcd8c346ef3cdd0ed55b08781fef474752e0f1
parent26afafb29a4e14b2c916fd51772134938ff81eaf
parenta46e6d53297a50eef1cd3fe24edbb44ac05257e7
Merge branch 'issue130_diagram_updates'