| commit | 5bae063ff2601db15d84920f18bae194bcd3d373 | [log] [tgz] |
|---|---|---|
| author | Alex Gaynor <alex.gaynor@gmail.com> | Thu Jan 02 10:55:36 2014 -0800 |
| committer | Alex Gaynor <alex.gaynor@gmail.com> | Thu Jan 02 10:55:36 2014 -0800 |
| tree | b6c39a3f84b434ae26245fcda6abe6c1e4165156 | |
| parent | 09aa74635f54ace5480a6d502b0da92651f516b6 [diff] | |
| parent | a6d5d6ec53da5bea0193047c5e535a05442f2dfd [diff] |
Merge branch 'master' into fernet Conflicts: docs/index.rst