Merge branch 'hotfix/1.1.1' v1.1.1
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 16:29:09 +0000 (11:29 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 16:29:09 +0000 (11:29 -0500)
commit417a7b019bdfd04b3e39921dac21bc47cfedbdfb
tree6a2b062ffd3a993c9fb6cd2cad6a42700b4f2375
parent5e4111a14ba8a2278a4f8e54eb10783e7e32779b
parentf28b9710ecf7e1c9ba5e8c221a02c09d3638e0d3
Merge branch 'hotfix/1.1.1'