Merge tag 'v1.0.14' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 5 Feb 2016 18:25:20 +0000 (13:25 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 5 Feb 2016 18:25:20 +0000 (13:25 -0500)
commit8f31739fc3e698a1013e171efa16bc8d3d47b37b
tree3bff6e61255742d3f71dc9c0da3881540e7f71ad
parent4744bc85d919409b0604145757366a09e56ff6ae
parent7ef5f602fdc7cc4778729529bafbca66f5a08c1a
Merge tag 'v1.0.14' into develop

1.0.14