Merge pull request #388 from br101/master
authorsbyx <steven@midlink.org>
Wed, 1 Oct 2014 18:07:17 +0000 (20:07 +0200)
committersbyx <steven@midlink.org>
Wed, 1 Oct 2014 18:07:17 +0000 (20:07 +0200)
horst: Update to version 4.2


Trivial merge