Merge tag 'V1.1.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 3 Mar 2016 22:18:34 +0000 (17:18 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 3 Mar 2016 22:18:34 +0000 (17:18 -0500)
commit457b87b19c29d9acf89c294e4193f4f03c30ff82
tree59643ba962f6d164b7845bc7d4304eff6b448a01
parent0229e96ddbde052a1aff25b399dd8a5d619938c3
parentb2eec807bc73d63d4bf0a3c8d1e0f1f9ef60f180
Merge tag 'V1.1.4' into develop

v1.1.4