Merge branch 'release/1.4.2' v1.4.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Apr 2015 18:58:21 +0000 (14:58 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Apr 2015 18:58:21 +0000 (14:58 -0400)
commit543d6e6084c838d7523eec39e0473617d59bd528
tree63d2ae6ce0260e3a90f7ea61a4f8ae9b575c0f3d
parent4a4bf2287691b21eba9e47fb233b2cd69857d388
parent7fae89726421172bf503f35e7383960d87f7a831
Merge branch 'release/1.4.2'