Merge branch 'hotfix/1.0.5'
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Nov 2015 16:04:31 +0000 (11:04 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Nov 2015 16:04:31 +0000 (11:04 -0500)
commit7ded42b5d4331f6a99d15ef769dd560b2b5669da
tree3aaaa7f98dafcc1ee10d335b7bf26cc15a238ef7
parent05b0bd7a7cae95fae3c6d9b08816da25b8254784
parentb3ec32efc2a355c0cedfb7201767d0643bcb56c0
Merge branch 'hotfix/1.0.5'