Merge tag 'v1.1.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 20:40:53 +0000 (16:40 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 20:40:53 +0000 (16:40 -0400)
commit038552aa24858cfd7f9f4797d6c743935dbd6765
treebc9531a20152910afb77444df7f5ce235141d68a
parentaa690b95dcda3d8f8898fbbfbcb77e65c34ae13b
parent8aa5fd172c6653f7441beff4aa52cccc8d755834
Merge tag 'v1.1.5' into develop

v1.1.5