Merge branch 'hotfix/1.5.25' v1.5.25
authorSteve Sutton <steve@gaslightmedia.com>
Sat, 21 May 2016 10:30:06 +0000 (06:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Sat, 21 May 2016 10:30:06 +0000 (06:30 -0400)
commit234978bdaf07388e376e8efb724dbf1589b50a64
tree348244c09b29927d055ff8f730a37795a9030c73
parent9b969909deafcf77c467a0a7de5f5b38a26bc323
parent0d01ab1de59eafed6a512559b6c9551a695ddbac
Merge branch 'hotfix/1.5.25'