Merge branch 'hotfix/1.5.22' v1.5.22
authorLaury GvR <laury@gaslightmedia.com>
Fri, 22 Apr 2016 14:29:54 +0000 (10:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 22 Apr 2016 14:29:54 +0000 (10:29 -0400)
commitc3baffa0eb33825ff83937a5526a92215a746cf8
tree7c99eaf27e7a1ff85894f8615e09a5e5b4fea14e
parentea5854426feca8f31afb7aa5e7d669316250c905
parentdecff93782d70242de02a8e6880e76c6fbab0aca
Merge branch 'hotfix/1.5.22'