license.markdown @ 17ece76ba98a
Merge.
| author | Steve Losh <steve@stevelosh.com> | 
|---|---|
| date | Sun, 22 Apr 2012 13:36:33 +0100 | 
| parents | 68cedd7c0f16 | 
| children | 52cc06ab5af8 | 
Merge.
| author | Steve Losh <steve@stevelosh.com> | 
|---|---|
| date | Sun, 22 Apr 2012 13:36:33 +0100 | 
| parents | 68cedd7c0f16 | 
| children | 52cc06ab5af8 |