Merge tag 'v1.1.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 19:23:53 +0000 (15:23 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 19:23:53 +0000 (15:23 -0400)
commitaa690b95dcda3d8f8898fbbfbcb77e65c34ae13b
treeead29090e05f5fe0638dc232aacd645877df195a
parentda1385953a2053102a76377bdef4a4ce5f7d25fd
parent92c81aa58c5ad9bf2a34bdda346294fcb9e9d4d3
Merge tag 'v1.1.4' into develop

v1.1.4