Merge branch 'hotfix/1.4.5' v1.4.5
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Apr 2015 15:33:23 +0000 (11:33 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Apr 2015 15:33:23 +0000 (11:33 -0400)
commit60463f5165cbc786a9ae239fcdf50cc1477c6734
tree52d8cb3da21c8408595223ad2db6273045c6f4e0
parent04a25650d573c24eb50b44451110de666955ca84
parentd10102818ce5915262745996027dd8c3a687af99
Merge branch 'hotfix/1.4.5'