Merge tag 'v1.1.21' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 21:07:07 +0000 (17:07 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 21:07:07 +0000 (17:07 -0400)
commit7ed4440430efddc1ebbc065e28e75873c808380d
treec5ba1620f0d147b93f518c2ffb5012b9877b482a
parentcf55d75170934d23e6c27149da0841e0b27dfa08
parent65bd01efb1fbbb968d74affeb678f8b329a5c213
Merge tag 'v1.1.21' into develop

v1.1.21