| commit | 7df1073dd82ddb9b842d16b7baeffb249fc36839 | [log] [tgz] |
|---|---|---|
| author | zheilbron <zheilbron@gmail.com> | Fri Dec 06 10:03:25 2013 -0800 |
| committer | zheilbron <zheilbron@gmail.com> | Fri Dec 06 10:03:25 2013 -0800 |
| tree | 778fc2cd509e1056b6e34ec2b9fd28d3cc504702 | |
| parent | a082fa74db87bb5703fde4e07c8ab106a9660d78 [diff] |
fix conflict in comment