Merge tag 'v1.1.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 14:13:40 +0000 (09:13 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 14:13:40 +0000 (09:13 -0500)
commitd7d505cc69fef4fed6040160afdc6fbfb5afb9fb
tree03730c0196ca4134c44f7f7820cd996ddacbf1d7
parent6f54342ccb549dd09162ee2148606bb0c652de73
parent29ac1bb5fd6680fdf506e296ef7ed7e8f585f12f
Merge tag 'v1.1.4' into develop

v1.1.4