license.markdown @ d6110e1c1451
Merge.
| author | Steve Losh <steve@stevelosh.com> | 
|---|---|
| date | Fri, 12 Oct 2012 19:11:35 -0400 | 
| parents | 68cedd7c0f16 | 
| children | 52cc06ab5af8 | 
Merge.
| author | Steve Losh <steve@stevelosh.com> | 
|---|---|
| date | Fri, 12 Oct 2012 19:11:35 -0400 | 
| parents | 68cedd7c0f16 | 
| children | 52cc06ab5af8 |