tree 2fbbe2815a356840ee840f5061fe62e96bf1feee
parent b799a0b3f09238fe46892b811025e7bf2ac81b19
parent 1c75780da904b2a56c30c693fc3e03d2145614c2
author Andrey Andreev <narf@devilix.net> 1375871896 -0700
committer Andrey Andreev <narf@devilix.net> 1375871896 -0700

Merge pull request #2589 from vlakoff/feature/user-guide-cleanup

Fix a few more merge conflicts