Merge tag 'v1.1.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:55:46 +0000 (15:55 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:55:46 +0000 (15:55 -0500)
commit9d59af2b91c01b101a8aa6b42ee8673d61253635
treef762d6eafc4ec6fb397085a17d14e516d467b0ff
parent1f4abdb32af03ed642511d463428f63b39ff056e
parent6d21515737ff7346b6e65c6199bf92aea25acae0
Merge tag 'v1.1.5' into develop

v1.1.5