Merge tag 'v1.2.12' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Jun 2016 16:31:27 +0000 (12:31 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Jun 2016 16:31:27 +0000 (12:31 -0400)
commit46930762a71ce661349a0ee501a4bce641b5837d
tree3512cd26597a3d2f94235e2235780925129cb54a
parentb9d9df6407ef6348be1a9238a51738d6c0e69ab5
parenta88a1381d6559e0b85ffe29f88b8f3bafe6d0142
Merge tag 'v1.2.12' into develop

Version 1.1.12