Merge branch 'release/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Feb 2015 16:56:28 +0000 (11:56 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Feb 2015 16:56:28 +0000 (11:56 -0500)
commit6c2295fd011d51f2579d104884c81a3e2ae3b3c4
treee32178d53467de8cd45d846d91bb5579012e1cc6
parent9a0b5757ae14b52a35229c1a60a4ca79c41b7dee
parent4de35dc378bec9e3e84a9afb6b3c889a2bfcaeaf
Merge branch 'release/1.0.5'