| commit | 584c94fc4b65025e4a4bf8d7367c7b7add100246 | [log] [tgz] |
|---|---|---|
| author | Jon Perritt <jrperritt@gmail.com> | Wed Sep 24 18:00:16 2014 -0500 |
| committer | Jon Perritt <jrperritt@gmail.com> | Sun Sep 28 23:07:56 2014 -0500 |
| tree | d53dbddd4bd15023615c421813247f60fd8e7cea | |
| parent | cc10e317b574700e2d8e35f91c5fe44a6a53fe41 [diff] |
missed this on resolving merge conflicts