Merge branch 'hotfix/0.3.6' v0.3.6
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 18 Jan 2016 17:52:57 +0000 (12:52 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 18 Jan 2016 17:52:57 +0000 (12:52 -0500)
commit6ce11ea6f0c39d4b2da1a0947e9b92cd181fab63
tree33a126649b61eb3229f9de57f87c99cc91e7701d
parent4a9303f99b4ac0715da1cb14533d1d55d006848a
parentbd64b14c8bc445f5a205bf117879eb097c7b8b64
Merge branch 'hotfix/0.3.6'