Merge tag 'v1.1.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Aug 2014 17:08:03 +0000 (13:08 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Aug 2014 17:08:03 +0000 (13:08 -0400)
commit875f0d7b2385b492a52079f698b2021634b0c4d0
treeec3101ae001a83dccd2c5aa15414845f13d8aec7
parent73655499b7b35030d5cc0d080d5562a87bbf3d7b
parent3b3fff3c6797bf6d5fb2f7d812650b768990d49d
Merge tag 'v1.1.6' into develop

Version 1.1.6