Merge branch 'release/1.2.5' v1.2.5
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Mar 2015 18:50:14 +0000 (14:50 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Mar 2015 18:50:14 +0000 (14:50 -0400)
commit4224b153b7b697c13fe992f6dd3ca14e09d24fb9
tree77243e40787b3ed89fd11f9a6e5bf1b6eca20579
parentca9e3c5ae205d77e810b4d9aaeff7db5273b6478
parentee708950f47c61f710ca63795bdfb8dfc02bc96e
Merge branch 'release/1.2.5'