notes about recent merges
notes about recent merges

ghtdak/txtorcon,meejah/txtorcon,isislovecruft/txtorcon,meejah/txtorcon,ghtdak/txtorcon,david415/txtorcon,sammyshj/txtorcon,david415/txtorcon,sammyshj/txtorcon,isislovecruft/txtorcon