Merge branch 'release/1.2.11' v1.2.11
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Apr 2017 16:14:41 +0000 (12:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Apr 2017 16:14:41 +0000 (12:14 -0400)
commit072ff1030b8e651fca53739ceb44996438350b87
tree969f1ef10c5acafc7c04e7b30158a5e184208d67
parent0e60d72b0e1f08286b67550418c51b94ab99d9c6
parent89d62405b6406337fdb7fecae208f4e920332b2f
Merge branch 'release/1.2.11'