Merge tag 'v1.1.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 16:11:13 +0000 (12:11 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 16:11:13 +0000 (12:11 -0400)
commit1150e7729a72187c1fefa585ad5c4f83f175c88f
tree244ea6c1e7ff2b6a9909298ee831c0245af29a1d
parent83d8abbe4087c2e1e3fec4d87b4995f66425d4ea
parentbedb0584d72be9ed056b4cbcf700ed916d3a3306
Merge tag 'v1.1.4' into develop

v1.1.4