diff options
author | lloyd <[email protected]> | 2014-01-24 16:29:31 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2014-01-24 16:29:31 +0000 |
commit | 1285c3ba7de7aeddc0d4238150a9922dcc08d56b (patch) | |
tree | f2f2cad8dd8dc948d02a56f44542ff51849ad2cd /doc/conf.py | |
parent | 41493179880dca34168da4e7d55ac616423488da (diff) | |
parent | d3f3d8f15da31dc9cda9857980ba216433a0e9f2 (diff) |
merge of '2d881fa8d594bbc945cf357a4d7314a6a4659a58'
and 'f3db4cbb2f054fd83000650b5e11973a00b908a4'
Diffstat (limited to 'doc/conf.py')
0 files changed, 0 insertions, 0 deletions