Merge tag 'v1.2.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Mar 2015 18:50:23 +0000 (14:50 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Mar 2015 18:50:23 +0000 (14:50 -0400)
Version 1.2.5


Trivial merge