Merge tag 'v1.2.25' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 14:49:09 +0000 (10:49 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 14:49:09 +0000 (10:49 -0400)
commit5f3ca47670fb9d107d1c901dbf6ca8f2f5c0b2ab
tree0c1c412ef713bc7905e7d2e500ad812d528f3978
parentabefa6d2fa66eb158b251d6b2bf2ff240f5da1a4
parent33e67fc3addcd5e8badda1d365ddb8660bc5e590
Merge tag 'v1.2.25' into develop

version 1.2.25