Merge branch 'hotfix/1.0.54' v1.0.54
authorLaury GvR <laury@gaslightmedia.com>
Tue, 29 Dec 2015 22:02:33 +0000 (17:02 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 29 Dec 2015 22:02:33 +0000 (17:02 -0500)
commitd165cde31d2ecb3a56fc2e2220f8a373ed7a7378
treeb44699eb9b94d68f86b1b7c577f33fb9d3693b84
parentf710e3e949ae197382345c26db7a164989cf83dc
parent2cb113c266c924867dfee84a70ea0c1d5d8ed91b
Merge branch 'hotfix/1.0.54'