Merge tag 'v1.2.36' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 17 Apr 2015 12:46:50 +0000 (08:46 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 17 Apr 2015 12:46:50 +0000 (08:46 -0400)
commitd303ea67a520da9d4c60c01b27da77865c65399d
tree98769769c2a804a8b4fa090db077a046ff11ba47
parentf950b2eaf9bd6cade4f15563d7cc4b5eefd74caa
parent1ece094a2ede5fea4939e16d1f1deea77192645e
Merge tag 'v1.2.36' into develop

Version 1.2.36