Merge tag 'v1.36' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 2 Feb 2015 19:24:58 +0000 (14:24 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 2 Feb 2015 19:24:58 +0000 (14:24 -0500)
commit159190de42370d2021db4c78bcc598cb6568e98d
tree170375da2e6aa792e4d30133ff7597b2326e7511
parent0f7b1d078130704510440542ce6ebf300ad7444f
parent05db72d525a71247f9b98b19b2c9ddad581bca2d
Merge tag 'v1.36' into develop

Version 1.36