Merge branch 'release/1.2.5' v1.2.5
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 18:40:30 +0000 (14:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 18:40:30 +0000 (14:40 -0400)
commit3f4d0054f327d930bb637ae676e5513c53776e7b
treeb85f95dc5869be78cf7a6a1319c1cdd53b7daed0
parentffba007f5b7154b9cc1afc11c812a49e188ab07f
parentbc342b9bb65f7a705ac07f0244d9e7010026737f
Merge branch 'release/1.2.5'