| commit | 737ccb75a8522baa4ae36f3b855dd8911d2ea954 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Wed Nov 06 14:38:47 2013 -0800 |
| committer | Trevor Johns <trevorjohns@google.com> | Wed Nov 06 14:38:47 2013 -0800 |
| tree | 4cdd61893d24b9f6244ff0d94c8e883f93ec20d2 | |
| parent | 2b1169e2095f5e30f118abd146a62007697cecc3 [diff] | |
| parent | f49bfc3d06d0cc0eac0ce1a5620ef5bc8e38f064 [diff] |
Merge branch 'klp-dev' into 'klp-docs'