Merge branch 'fulltree'
authorThomasV <thomasv1@gmx.de>
Mon, 24 Feb 2014 17:11:16 +0000 (18:11 +0100)
committerThomasV <thomasv1@gmx.de>
Mon, 24 Feb 2014 17:11:16 +0000 (18:11 +0100)

Trivial merge