Merge tag 'v1.1.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 18:30:05 +0000 (14:30 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 18:30:05 +0000 (14:30 -0400)
commit608a04373c5fddeeaa1d1297a768147705b69196
treeffb55e84ad20d5975df934b052145aa5c553fab0
parent1150e7729a72187c1fefa585ad5c4f83f175c88f
parent90b8e5e5b8728f29ed0645c96b23cac21b979305
Merge tag 'v1.1.5' into develop

v1.1.5