Merge tag 'v1.2.21' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jan 2016 19:12:56 +0000 (14:12 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jan 2016 19:12:56 +0000 (14:12 -0500)
commit1a6e94a18e5c6956e3b6bffad6046c7837128622
tree221c26fb016a47dae9d091c14bd91f87766ba8f1
parentcc4b1b5eee7393469244e10a8ebe8aacfbb292ab
parent38105216edd21bc135c889dac5ea27da0e9d6ad2
Merge tag 'v1.2.21' into develop

v1.2.21