Merge branch 'hotfix/1.1.26' v1.1.26
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 30 Dec 2015 21:17:16 +0000 (16:17 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 30 Dec 2015 21:17:16 +0000 (16:17 -0500)
commit48d9d95a203f10d29f63dbfe9f9491273da4feb5
tree43504844961ab592b12a115075524ab3b2223362
parent299fb553c702c1df62be582cc0062518808deee5
parent6aa3e8a5d5abc50dc4b33fe68d437b61e564bd8c
Merge branch 'hotfix/1.1.26'