Merge pull request #643 from annando/master
authortobiasd <tobias.diekershoff@gmx.net>
Wed, 6 Mar 2013 06:06:39 +0000 (22:06 -0800)
committertobiasd <tobias.diekershoff@gmx.net>
Wed, 6 Mar 2013 06:06:39 +0000 (22:06 -0800)
Vier - many changes


Trivial merge