Merge tag 'v1.2.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Apr 2016 16:48:44 +0000 (12:48 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Apr 2016 16:48:44 +0000 (12:48 -0400)
commitbee24b8c742ef59efcae88347e3301a3c01bde5c
tree0f55bbd3a07ff573c7bc02e9ca3de523faa3f758
parent69613c3cf7627a7019d9eec2a859e8bc5ff0b718
parent0e9dfede44af8ca65d688c416d0ed138a9abc3ed
Merge tag 'v1.2.5' into develop

Version 1.2.5