Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Oct 2014 17:09:12 +0000 (13:09 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Oct 2014 17:09:12 +0000 (13:09 -0400)
commitebf153b6b188192a774f2e2d8feb63f588a87449
treed6584e924aa410ae043bd3efcb819024590e9690
parent5abd174d99085bcdbe67d0f5f8d87a7c5ead20e5
parent652db2a5180bf35280beaac7b882488790872335
Merge branch 'hotfix/1.0.5'