tree 03d06e1078efd6b510af6341a8b35590a52e4007
parent 269021416e5be273f9510357c1994b63f77e1c64
parent dd536b7028c5d8e502cc7387ddb5f3fe8c8770d8
author Andrey Andreev <narf@devilix.net> 1391801661 +0200
committer Andrey Andreev <narf@devilix.net> 1391801661 +0200

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