tree dff94f4319a60132691ed0181c32d294e473f2b2
parent 44930554e0a47027b136abf2904825cab53f965f
parent 2b284f9b171ba0e0886db15772a6a62e9155f74f
author Andrey Andreev <narf@devilix.net> 1390602397 +0200
committer Andrey Andreev <narf@devilix.net> 1390602397 +0200

Merge branch 'develop' into feature/user-guide-cleanup