Merge branch 'hotfix/1.1.23' V1.1.23
authorLaury GvR <laury@gaslightmedia.com>
Thu, 10 Dec 2015 19:32:49 +0000 (14:32 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 10 Dec 2015 19:32:49 +0000 (14:32 -0500)
commit13e9d0243742ed5bd693dfa2b80e5dc294849001
treed0059c296e34d4d8ae1ddf1be1a62ed4a50221d0
parentd15c31612f4b24243e5afa82807a63eee434658a
parentee00b01171ab64ca5406c18051640f11cf59dcbc
Merge branch 'hotfix/1.1.23'