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)
commit1e6ca72ffe0feb239ec3e5c384ef7b9958fde14b
tree77243e40787b3ed89fd11f9a6e5bf1b6eca20579
parentee708950f47c61f710ca63795bdfb8dfc02bc96e
parent4224b153b7b697c13fe992f6dd3ca14e09d24fb9
Merge tag 'v1.2.5' into develop

Version 1.2.5