Merge tag 'v1.2.14' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 16:10:55 +0000 (12:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 16:10:55 +0000 (12:10 -0400)
commite4189fa37bdbb644de08c897c605a79d8beb09a3
tree028bf6346fa4eb6c1ea742bf9cd949a95e681672
parent3a4e781cd4d7b1e2b967ed7c2f119f5f58a8dc6e
parent0c57d366a6a50fe66c013708711cedb9c56cb2cd
Merge tag 'v1.2.14' into develop

Version 1.2.14