Merge tag 'v1.1.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 30 Nov 2015 13:57:53 +0000 (08:57 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 30 Nov 2015 13:57:53 +0000 (08:57 -0500)
commit1cc383d0afd6d352defe64871492374c38c46fd3
treeed2f31f7994f9b8799a067b242da7c3457276e09
parent2aefe3f22a9a283f9e0340d2b3f9787c796f54db
parent49d19d60b634e4234ef10e8dcfe963fe5ceb8f59
Merge tag 'v1.1.4' into develop

v1.1.4