fixed merge conflicts and small addings
authorMart Lubbers <mart@martlubbers.net>
Tue, 8 Jul 2014 13:33:33 +0000 (15:33 +0200)
committerMart Lubbers <mart@martlubbers.net>
Tue, 8 Jul 2014 13:33:33 +0000 (15:33 +0200)

No differences found