Merge tag 'v1.2.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 19:40:18 +0000 (14:40 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 19:40:18 +0000 (14:40 -0500)
commit851288a8f7a03747ec57671626668650e295dfa6
tree56b7c2b61cd6f7a5892382fbce94e178f4e2e028
parent5ded67bfa75afc93dcd72857db5008c96be2efbb
parente18d8079c0b999c5e5574c46e97e75c5df65e4d5
Merge tag 'v1.2.5' into develop

Version 1.2.5