| tag | c452699208f58b01786059b812846ad5de3df16e | |
|---|---|---|
| tagger | Mark Ellzey <mark.thomas@mandiant.com> | Thu Jun 30 16:50:47 2011 |
| object | 6a606a472d7a91be4d5b3303804d610203017c0b |
Release v0.3.4
| commit | 6a606a472d7a91be4d5b3303804d610203017c0b | [log] [tgz] |
|---|---|---|
| author | Mark Ellzey <mark.thomas@mandiant.com> | Thu Jun 30 16:45:40 2011 |
| committer | Mark Ellzey <mark.thomas@mandiant.com> | Thu Jun 30 16:45:40 2011 |
| tree | 717844e123e4104ce8132bfa0a450ad08b6f0faa | |
| parent | 06df68a0e2a1a7a202e62dc9cd3c13d4f4d03543 [diff] |
Fixing up problems with the conflict resolution